diff options
| author | Stijn Buys <ingar@osirion.org> | 2007-11-10 14:31:30 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2007-11-10 14:31:30 +0000 |
| commit | e4168305de096ed8b47308d35dbc16912a74230a (patch) | |
| tree | 9cef430e4c053383a90d8eb0af2bf5ccb65ad6d9 /src | |
| parent | 4b4936c2546e41b503e54d58a1badfec3493f53b (diff) | |
project updates
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/Makefile.am | 7 | ||||
| -rw-r--r-- | src/common/Makefile.am | 5 | ||||
| -rw-r--r-- | src/game/Makefile.am | 4 | ||||
| -rw-r--r-- | src/server/Makefile.am | 3 |
4 files changed, 11 insertions, 8 deletions
diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 3df02d3..12b8f5d 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -3,9 +3,8 @@ METASOURCES = AUTO bin_PROGRAMS = osirion osirion_LDADD = $(top_builddir)/src/game/libgame.la \ $(top_builddir)/src/gl/libosiriongl.la -osirion_SOURCES = camera.cc camera.h client.cc client.h input.cc input.h \ - main.cc shipdrawer.cc shipdrawer.h stardrawer.cc stardrawer.h video.cc video.h \ - view.cc view.h console.cc console.h +osirion_SOURCES = camera.cc client.cc console.cc hud.cc input.cc main.cc \ + shipdrawer.cc stardrawer.cc video.cc view.cc @@ -13,3 +12,5 @@ INCLUDES = -I$(top_srcdir)/src osirion_CFLAGS = $(LIBSDL_CFLAGS) osirion_LDFLAGS = $(LIBSDL_LIBS) +noinst_HEADERS = camera.h client.h console.h input.h shipdrawer.h stardrawer.h \ + video.h view.h diff --git a/src/common/Makefile.am b/src/common/Makefile.am index dbed1fb..d7fc6e6 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,7 +2,8 @@ METASOURCES = AUTO libcommon_la_LDFLAGS = -avoid-version -no-undefined noinst_LTLIBRARIES = libcommon.la -libcommon_la_SOURCES = color.cc color.h file.cc file.h functions.cc functions.h \ - vector3f.cc vector3f.h console.cc console.h +libcommon_la_SOURCES = color.cc console.cc file.cc functions.cc inifile.cc \ + vector3f.cc +noinst_HEADERS = color.h console.h file.h functions.h inifile.h vector3f.h diff --git a/src/game/Makefile.am b/src/game/Makefile.am index ff46654..48c33d3 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO libgame_la_LDFLAGS = -avoid-version -no-undefined noinst_LTLIBRARIES = libgame.la -libgame_la_SOURCES = game.cc game.h player.h sector.h ship.cc ship.h star.cc \ - star.h world.h +libgame_la_SOURCES = game.cc sector.cc ship.cc star.cc INCLUDES = -I$(top_srcdir)/src libgame_la_LIBADD = $(top_builddir)/src/common/libcommon.la +noinst_HEADERS = game.h player.h sector.h ship.h star.h world.h diff --git a/src/server/Makefile.am b/src/server/Makefile.am index c167667..7532f1c 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = -I$(top_srcdir)/src METASOURCES = AUTO bin_PROGRAMS = osiriond -osiriond_SOURCES = console.cc console.h main.cc timer.cc timer.h +osiriond_SOURCES = console.cc main.cc timer.cc osiriond_LDADD = $(top_builddir)/src/game/libgame.la +noinst_HEADERS = console.h timer.h |