Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2007-10-21 23:03:29 +0000
committerStijn Buys <ingar@osirion.org>2007-10-21 23:03:29 +0000
commit621f4ad1d509665e19738525c80e104b80fb7b26 (patch)
tree8c3ff6cc028dcbebfb616b38f9ae443c628cc58f
parenta237a2d7723b94df6cd3e91401ec28388de6f1a0 (diff)
automake updates
-rw-r--r--src/client/Makefile.am4
-rw-r--r--src/common/Makefile.am4
-rw-r--r--src/game/Makefile.am9
-rw-r--r--src/gl/Makefile.am2
-rw-r--r--src/server/Makefile.am3
5 files changed, 11 insertions, 11 deletions
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index f234f49..40bafa1 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,8 +1,8 @@
METASOURCES = AUTO
bin_PROGRAMS = osirion
-osirion_LDADD = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/game/libgame.la $(top_builddir)/src/gl/libosiriongl.la -lSDL
+osirion_LDADD = $(top_builddir)/src/game/libgame.la \
+ $(top_builddir)/src/gl/libosiriongl.la -lSDL
osirion_SOURCES = camera.cc camera.h input.cc input.h main.cc video.cc video.h \
view.cc view.h shipdrawer.cc shipdrawer.h stardrawer.cc stardrawer.h
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5770301..86bb4e1 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -2,7 +2,7 @@
METASOURCES = AUTO
libcommon_la_LDFLAGS = -avoid-version -no-undefined
noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = color.cc color.h functions.cc functions.h vector3f.cc \
- vector3f.h
+libcommon_la_SOURCES = color.cc color.h file.cc file.h functions.cc functions.h \
+ vector3f.cc vector3f.h
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 9e86c15..537bb3a 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -1,9 +1,10 @@
METASOURCES = AUTO
-libgame_la_LDFLAGS = -avoid-version
+libgame_la_LDFLAGS = -avoid-version -no-undefined
noinst_LTLIBRARIES = libgame.la
-libgame_la_SOURCES = console.h file.cc file.h game.cc game.h player.h sector.h \
- ship.cc ship.h star.cc star.h world.h
+libgame_la_SOURCES = game.cc game.h player.h sector.h ship.cc ship.h star.cc \
+ star.h world.h
INCLUDES = -I$(top_srcdir)/src
-noinst_HEADERS = console.h file.h sector.h world.h
+noinst_HEADERS = sector.h world.h
+libgame_la_LIBADD = $(top_builddir)/src/common/libcommon.la
diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
index e7f6663..3fcd178 100644
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -1,7 +1,7 @@
METASOURCES = AUTO
-libosiriongl_la_LDFLAGS = -avoid-version
+libosiriongl_la_LDFLAGS = -avoid-version -no-undefined
noinst_LTLIBRARIES = libosiriongl.la
INCLUDES = -I$(top_srcdir)/src
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 20dffcd..0859838 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -3,5 +3,4 @@ METASOURCES = AUTO
bin_PROGRAMS = osiriond
osiriond_SOURCES = main.cc timer.cc timer.h
noinst_HEADERS = timer.h
-osiriond_LDADD = $(top_builddir)/src/game/libgame.la \
- $(top_builddir)/src/common/libcommon.la
+osiriond_LDADD = $(top_builddir)/src/game/libgame.la