cleaned up autoconf/automake project files, this should solve build order and dependency issues

1 files changed, 40 insertions, 36 deletions

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 7155f86..ce76303 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -3,42 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libcore.la
 
-libcore_la_LDFLAGS = -avoid-version -no-undefined
-
-libcore_la_LIBADD = $(top_builddir)/src/model/libmodel.la \
-	$(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/math/libmath.la $(top_builddir)/src/sys/libsys.la \
-	$(top_builddir)/src/auxiliary/libauxiliary.la
-
-
-libcore_la_SOURCES = \
-	application.cc \
-	commandbuffer.cc \
-	core.cc \
-	cvar.cc \
-	descriptions.cc \
-	entity.cc \
-	extension.cc \
-	func.cc \
-	gameconnection.cc \
-	gameinterface.cc \
-	gameserver.cc \
-	info.cc \
-	inventory.cc \
-	item.cc \
-	label.cc \
-	loader.cc \
-	module.cc \
-	netclient.cc \
-	netconnection.cc \
-	netplayer.cc \
-	netserver.cc \
-	parser.cc \
-	physics.cc \
-	player.cc \
-	stats.cc \
-	timer.cc \
-	zone.cc
-
 noinst_HEADERS = \
 	application.h \
 	commandbuffer.h \
@@ -70,3 +34,43 @@ noinst_HEADERS = \
 	stats.h \
 	timer.h \
 	zone.h
+
+libcore_la_SOURCES = \
+	application.cc \
+	commandbuffer.cc \
+	core.cc \
+	cvar.cc \
+	descriptions.cc \
+	entity.cc \
+	extension.cc \
+	func.cc \
+	gameconnection.cc \
+	gameinterface.cc \
+	gameserver.cc \
+	info.cc \
+	inventory.cc \
+	item.cc \
+	label.cc \
+	loader.cc \
+	module.cc \
+	netclient.cc \
+	netconnection.cc \
+	netplayer.cc \
+	netserver.cc \
+	parser.cc \
+	physics.cc \
+	player.cc \
+	stats.cc \
+	timer.cc \
+	zone.cc
+
+libcore_la_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
+
+libcore_la_LIBADD = 
+
+libcore_la_LDFLAGS = -avoid-version -no-undefined