From 2daac503a3a2f149f883db7c30199ebbb1f00c7f Mon Sep 17 00:00:00 2001 From: Stijn Buys 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/game/Makefile.am | 29 ++++++++++++++++++++++------- src/game/base/Makefile.am | 44 ++++++++++++++++++++++++++++---------------- src/game/example/Makefile.am | 23 +++++++++++++++++++---- src/game/intro/Makefile.am | 24 ++++++++++++++++++++---- 4 files changed, 89 insertions(+), 31 deletions(-) (limited to 'src/game') diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 47ca032..2aaf56f 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -1,11 +1,26 @@ -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game METASOURCES = AUTO - -libgame_la_LDFLAGS = -avoid-version -libgame_la_SOURCES = game.cc +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game +SUBDIRS = base example intro noinst_LTLIBRARIES = libgame.la noinst_HEADERS = game.h -SUBDIRS = base example intro -libgame_la_LIBADD = $(top_builddir)/src/game/base/libbase.la \ - $(top_builddir)/src/game/intro/libintro.la $(top_builddir)/src/game/example/libexample.la + +libgame_la_SOURCES = game.cc + +libgame_la_LDFLAGS = -avoid-version -no-undefined + +libgame_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 \ + $(top_builddir)/src/core/libcore.la \ + $(top_builddir)/src/game/base/libbase.la \ + $(top_builddir)/src/game/example/libexample.la \ + $(top_builddir)/src/game/intro/libintro.la + +libgame_la_LIBADD = \ + $(top_builddir)/src/game/base/libbase.la \ + $(top_builddir)/src/game/example/libexample.la \ + $(top_builddir)/src/game/intro/libintro.la diff --git a/src/game/base/Makefile.am b/src/game/base/Makefile.am index bb0d967..a64f73f 100644 --- a/src/game/base/Makefile.am +++ b/src/game/base/Makefile.am @@ -1,21 +1,8 @@ -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game METASOURCES = AUTO -libbase_la_LDFLAGS = -avoid-version +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game + noinst_LTLIBRARIES = libbase.la -libbase_la_SOURCES = \ - cargo.cc \ - cargopod.cc \ - faction.cc \ - game.cc \ - jumppoint.cc \ - navpoint.cc \ - planet.cc \ - racetrack.cc \ - ship.cc \ - shipmodel.cc \ - star.cc \ - station.cc \ - template.cc + noinst_HEADERS = \ cargo.h \ cargopod.h \ @@ -30,3 +17,28 @@ noinst_HEADERS = \ star.h \ station.h \ template.h + +libbase_la_SOURCES = \ + cargo.cc \ + cargopod.cc \ + faction.cc \ + game.cc \ + jumppoint.cc \ + navpoint.cc \ + planet.cc \ + racetrack.cc \ + ship.cc \ + shipmodel.cc \ + star.cc \ + station.cc \ + template.cc + +libbase_la_LDFLAGS = -avoid-version -no-undefined + +libbase_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 \ + $(top_builddir)/src/core/libcore.la diff --git a/src/game/example/Makefile.am b/src/game/example/Makefile.am index bb285eb..99dec0a 100644 --- a/src/game/example/Makefile.am +++ b/src/game/example/Makefile.am @@ -1,6 +1,21 @@ -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game METASOURCES = AUTO -libexample_la_LDFLAGS = -avoid-version +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game + noinst_LTLIBRARIES = libexample.la -noinst_HEADERS = example.h spectator.h -libexample_la_SOURCES = example.cc spectator.cc +noinst_HEADERS = \ + example.h \ + spectator.h + +libexample_la_SOURCES = \ + example.cc \ + spectator.cc + +libexample_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 \ + $(top_builddir)/src/core/libcore.la + +libexample_la_LDFLAGS = -avoid-version -no-undefined diff --git a/src/game/intro/Makefile.am b/src/game/intro/Makefile.am index eeb6f9d..a9d09b9 100644 --- a/src/game/intro/Makefile.am +++ b/src/game/intro/Makefile.am @@ -1,6 +1,22 @@ -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game METASOURCES = AUTO -libintro_la_LDFLAGS = -avoid-version +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game + noinst_LTLIBRARIES = libintro.la -libintro_la_SOURCES = convoy.cc intro.cc -noinst_HEADERS = convoy.h intro.h + +noinst_HEADERS = \ + convoy.h \ + intro.h + +libintro_la_SOURCES = \ + convoy.cc \ + intro.cc + +libintro_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 \ + $(top_builddir)/src/core/libcore.la + +libintro_la_LDFLAGS = -avoid-version -no-undefined -- cgit v1.2.3