From 2daac503a3a2f149f883db7c30199ebbb1f00c7f Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 16 Nov 2010 19:26:53 +0000
Subject: cleaned up autoconf/automake project files, this should solve build
 order and dependency issues

---
 src/Makefile.am | 90 +++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 65 insertions(+), 25 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index c3dc7c8..5064fba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,19 @@ SUFFIXES = .rc
 .rc.o:
 	windres $< -o $@
 
-SUBDIRS = auxiliary math sys filesystem model core dedicated render ui audio \
-	client game
+SUBDIRS = \
+	auxiliary  \
+	math \
+	sys \
+	filesystem \
+	model \
+	core \
+	dedicated \
+	audio \
+	render \
+	ui \
+	client \
+	game
 
 noinst_HEADERS = config.h
 
@@ -18,33 +29,62 @@ endif
 # dedicated dedicated
 osiriond_SOURCES = osiriond.cc
 EXTRA_osiriond_SOURCES = osiriond-res.rc
-osiriond_DEPENDENCIES = $(ICON_SERVER) $(top_builddir)/src/core/libcore.la \
-	$(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la \
-	$(top_builddir)/src/model/libmodel.la $(top_builddir)/src/dedicated/libdedicated.la \
-	$(top_builddir)/src/sys/libsys.la $(top_builddir)/src/auxiliary/libauxiliary.la
-osiriond_LDADD = $(top_builddir)/src/auxiliary/libauxiliary.la \
-	$(top_builddir)/src/core/libcore.la $(top_builddir)/src/filesystem/libfilesystem.la \
+
+osiriond_DEPENDENCIES = \
+	$(top_builddir)/src/auxiliary/libauxiliary.la \
+	$(top_builddir)/src/math/libmath.la \
+	$(top_builddir)/src/sys/libsys.la \
+	$(top_builddir)/src/filesystem/libfilesystem.la \
+	$(top_builddir)/src/model/libmodel.la \
+	$(top_builddir)/src/core/libcore.la \
+	$(top_builddir)/src/dedicated/libdedicated.la \
+	$(top_builddir)/src/game/libgame.la \
+	$(ICON_SERVER)
+
+osiriond_LDADD = \
 	$(top_builddir)/src/game/libgame.la \
-	$(top_builddir)/src/model/libmodel.la $(top_builddir)/src/dedicated/libdedicated.la \
-	$(top_builddir)/src/math/libmath.la $(top_builddir)/src/sys/libsys.la \
-	$(BULLET_LIBS) \
-	$(HOST_LIBS) $(BULLET_LIBS) $(CURSES_LIBS) $(ICON_SERVER)
+	$(top_builddir)/src/dedicated/libdedicated.la \
+	$(top_builddir)/src/core/libcore.la \
+	$(top_builddir)/src/model/libmodel.la \
+	$(top_builddir)/src/filesystem/libfilesystem.la \
+	$(top_builddir)/src/sys/libsys.la \
+	$(top_builddir)/src/math/libmath.la \
+	$(top_builddir)/src/auxiliary/libauxiliary.la \
+	$(ICON_SERVER) \
+	$(BULLET_LIBS) $(CURSES_LIBS) $(LIBZ_LIBS) $(HOST_LIBS)
 
 # client
 osirion_SOURCES = osirion.cc
 EXTRA_osirion_SOURCES = osirion-res.rc SDLMain.m
-osirion_DEPENDENCIES = $(ICON_CLIENT) $(SDLMAIN) $(top_builddir)/src/core/libcore.la \
-	$(top_builddir)/src/audio/libaudio.la $(top_builddir)/src/render/librender.la \
-	$(top_builddir)/src/ui/libui.la $(top_builddir)/src/client/libclient.la  \
-	$(top_builddir)/src/game/libgame.la
+
+osirion_DEPENDENCIES = \
+	$(top_builddir)/src/auxiliary/libauxiliary.la \
+	$(top_builddir)/src/math/libmath.la \
+	$(top_builddir)/src/sys/libsys.la \
+	$(top_builddir)/src/filesystem/libfilesystem.la \
+	$(top_builddir)/src/model/libmodel.la \
+	$(top_builddir)/src/core/libcore.la \
+	$(top_builddir)/src/audio/libaudio.la \
+	$(top_builddir)/src/render/librender.la \
+	$(top_builddir)/src/ui/libui.la \
+	$(top_builddir)/src/client/libclient.la  \
+	$(top_builddir)/src/game/libgame.la \
+	$(SDLMAIN) $(ICON_CLIENT)
+
 osirion_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS) $(GLUT_CFLAGS)
-osirion_LDADD = $(top_builddir)/src/game/libgame.la $(top_builddir)/src/ui/libui.la \
-	$(top_builddir)/src/client/libclient.la $(top_builddir)/src/audio/libaudio.la \
-	$(top_builddir)/src/render/librender.la $(top_builddir)/src/core/libcore.la \
-	$(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/model/libmodel.la \
-	$(top_builddir)/src/math/libmath.la $(top_builddir)/src/auxiliary/libauxiliary.la \
-	$(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/sys/libsys.la \
+
+osirion_LDADD =  \
+	$(top_builddir)/src/game/libgame.la \
+	$(top_builddir)/src/client/libclient.la  \
+	$(top_builddir)/src/ui/libui.la \
+	$(top_builddir)/src/render/librender.la \
+	$(top_builddir)/src/audio/libaudio.la \
+	$(top_builddir)/src/core/libcore.la \
+	$(top_builddir)/src/model/libmodel.la \
+	$(top_builddir)/src/filesystem/libfilesystem.la \
+	$(top_builddir)/src/sys/libsys.la \
+	$(top_builddir)/src/math/libmath.la \
 	$(top_builddir)/src/auxiliary/libauxiliary.la \
-	$(BULLET_LIBS) \
-	$(AL_LIBS) $(GL_LIBS) $(HOST_LIBS) $(LIBPNG_LIBS) $(LIBJPG_LIBS) $(SDLMAIN) $(ICON_CLIENT)
-osirion_LDFLAGS = $(LIBSDL_LIBS)
+	$(SDLMAIN) $(ICON_CLIENT) \
+	$(BULLET_LIBS)  $(LIBSDL_LIBS) $(AL_LIBS) $(GL_LIBS) \
+	$(LIBJPG_LIBS) $(LIBPNG_LIBS) $(LIBZ_LIBS) $(HOST_LIBS)
-- 
cgit v1.2.3