From 88047024d5d1d12dc581cd318667a89c2c5ec494 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 15 Dec 2013 20:20:36 +0000 Subject: Added --enable-static-libc option to the configure script, automake syntax updates, starsystem roadmap updates. --- src/Makefile.am | 4 ++-- src/audio/Makefile.am | 2 +- src/auxiliary/Makefile.am | 2 +- src/client/Makefile.am | 2 +- src/core/Makefile.am | 2 +- src/dedicated/Makefile.am | 2 +- src/filesystem/Makefile.am | 2 +- src/game/Makefile.am | 2 +- src/game/base/Makefile.am | 2 +- src/game/example/Makefile.am | 2 +- src/game/intro/Makefile.am | 2 +- src/math/Makefile.am | 2 +- src/model/Makefile.am | 2 +- src/render/Makefile.am | 2 +- src/sys/Makefile.am | 2 +- src/ui/Makefile.am | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 75aff0d..ccb90f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,7 +51,7 @@ osiriond_LDADD = \ $(top_builddir)/src/math/libmath.la \ $(top_builddir)/src/auxiliary/libauxiliary.la \ $(ICON_SERVER) \ - $(BULLET_LIBS) $(CURSES_LIBS) $(LIBZ_LIBS) $(HOST_LIBS) + $(BULLET_LIBS) $(CURSES_LIBS) $(LIBZ_LIBS) $(HOST_LIBS) $(STATIC_LDADD) # client osirion_SOURCES = osirion.cc @@ -87,4 +87,4 @@ osirion_LDADD = \ $(top_builddir)/src/auxiliary/libauxiliary.la \ $(SDLMAIN) $(ICON_CLIENT) \ $(BULLET_LIBS) $(LIBSDL_LIBS) $(LIBVORBISFILE_LIBS) $(AL_LIBS) $(GL_LIBS) \ - $(LIBJPG_LIBS) $(LIBPNG_LIBS) $(LIBZ_LIBS) $(HOST_LIBS) + $(LIBJPG_LIBS) $(LIBPNG_LIBS) $(LIBZ_LIBS) $(HOST_LIBS) $(STATIC_LDADD) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 8b76cc9..9ffd637 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src METASOURCES = AUTO if BUILD_DEDICATED diff --git a/src/auxiliary/Makefile.am b/src/auxiliary/Makefile.am index 6db5443..1658e2c 100644 --- a/src/auxiliary/Makefile.am +++ b/src/auxiliary/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libauxiliary.la libauxiliary_la_LDFLAGS = -avoid-version -no-undefined diff --git a/src/client/Makefile.am b/src/client/Makefile.am index fccf2d6..f6d447d 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src if BUILD_DEDICATED noinst_LTLIBRARIES = diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 3f7094d..2485ee9 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src noinst_LTLIBRARIES = libcore.la diff --git a/src/dedicated/Makefile.am b/src/dedicated/Makefile.am index 437ce71..8d5e7ac 100644 --- a/src/dedicated/Makefile.am +++ b/src/dedicated/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src noinst_LTLIBRARIES = libdedicated.la noinst_HEADERS = console.h dedicated.h diff --git a/src/filesystem/Makefile.am b/src/filesystem/Makefile.am index 8f5bafd..89737a6 100644 --- a/src/filesystem/Makefile.am +++ b/src/filesystem/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src noinst_LTLIBRARIES = libfilesystem.la noinst_HEADERS = \ diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 2aaf56f..c33369f 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/game SUBDIRS = base example intro noinst_LTLIBRARIES = libgame.la diff --git a/src/game/base/Makefile.am b/src/game/base/Makefile.am index 42a7f5c..5ac64c8 100644 --- a/src/game/base/Makefile.am +++ b/src/game/base/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/game noinst_LTLIBRARIES = libbase.la diff --git a/src/game/example/Makefile.am b/src/game/example/Makefile.am index 99dec0a..83a3118 100644 --- a/src/game/example/Makefile.am +++ b/src/game/example/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/game noinst_LTLIBRARIES = libexample.la noinst_HEADERS = \ diff --git a/src/game/intro/Makefile.am b/src/game/intro/Makefile.am index a9d09b9..bc3114f 100644 --- a/src/game/intro/Makefile.am +++ b/src/game/intro/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/game noinst_LTLIBRARIES = libintro.la diff --git a/src/math/Makefile.am b/src/math/Makefile.am index 0588bba..32644aa 100644 --- a/src/math/Makefile.am +++ b/src/math/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src noinst_LTLIBRARIES = libmath.la noinst_HEADERS = \ diff --git a/src/model/Makefile.am b/src/model/Makefile.am index dfd462e..cd7defd 100644 --- a/src/model/Makefile.am +++ b/src/model/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src noinst_LTLIBRARIES = libmodel.la diff --git a/src/render/Makefile.am b/src/render/Makefile.am index b5acde1..31b8567 100644 --- a/src/render/Makefile.am +++ b/src/render/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src METASOURCES = AUTO if BUILD_DEDICATED diff --git a/src/sys/Makefile.am b/src/sys/Makefile.am index ff1fbe0..4fd0f12 100644 --- a/src/sys/Makefile.am +++ b/src/sys/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src METASOURCES = AUTO libsys_la_LDFLAGS = -avoid-version -no-undefined noinst_LTLIBRARIES = libsys.la diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am index ef3289f..e309dda 100644 --- a/src/ui/Makefile.am +++ b/src/ui/Makefile.am @@ -1,5 +1,5 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src if BUILD_DEDICATED -- cgit v1.2.3