diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-05-12 13:08:45 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-05-12 13:08:45 +0000 |
| commit | e4f2faa8d5895ba30207c09c7886afb21a697d5f (patch) | |
| tree | 90751a70d480781c25274e70c4804f37acf72ee2 /src/Makefile.am | |
| parent | 24c695e83947d3457dbd1f5d696fa09b4ef953c0 (diff) | |
aux::plural, aux::article
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 19ad3be..81bd629 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ SUFFIXES = .rc .rc.o: windres $< -o $@ -SUBDIRS = sys math filesystem model core render server client game +SUBDIRS = auxiliary sys math filesystem model core server render client game noinst_HEADERS = config.h bin_PROGRAMS = osiriond osirion @@ -12,26 +12,29 @@ bin_PROGRAMS = osiriond osirion osiriond_SOURCES = osiriond.cc EXTRA_osiriond_SOURCES = osiriond-res.rc osiriond_DEPENDENCIES = $(ICON_SERVER) $(top_builddir)/src/core/libcore.la \ - $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/filesystem/libfilesystem.la \ - $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la \ - $(top_builddir)/src/server/libserver.la $(top_builddir)/src/sys/libsys.la -osiriond_LDADD = $(top_builddir)/src/game/libgame.la \ + $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la \ + $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/server/libserver.la \ + $(top_builddir)/src/sys/libsys.la $(top_builddir)/src/auxiliary/libauxiliary.la +osiriond_LDADD = $(top_builddir)/src/auxiliary/libauxiliary.la \ $(top_builddir)/src/core/libcore.la $(top_builddir)/src/filesystem/libfilesystem.la \ - $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/math/libmath.la \ - $(top_builddir)/src/server/libserver.la $(top_builddir)/src/sys/libsys.la $(HOST_LIBS) $(ICON_SERVER) + $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la \ + $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/server/libserver.la \ + $(top_builddir)/src/sys/libsys.la $(HOST_LIBS) $(ICON_SERVER) # client osirion_SOURCES = osirion.cc EXTRA_osirion_SOURCES = osirion-res.rc osirion_DEPENDENCIES = $(ICON_CLIENT) $(top_builddir)/src/client/libclient.la \ $(top_builddir)/src/core/libcore.la $(top_builddir)/src/filesystem/libfilesystem.la \ - $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la $(ICON_CLIENT) \ + $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la \ $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/render/librender.la \ - $(top_builddir)/src/sys/libsys.la + $(top_builddir)/src/sys/libsys.la $(top_builddir)/src/auxiliary/libauxiliary.la osirion_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS) $(GLUT_CFLAGS) -osirion_LDADD = $(top_builddir)/src/game/libgame.la \ - $(top_builddir)/src/client/libclient.la $(top_builddir)/src/core/libcore.la \ - $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/filesystem/libfilesystem.la \ - $(top_builddir)/src/math/libmath.la $(top_builddir)/src/render/librender.la \ - $(top_builddir)/src/sys/libsys.la $(GL_LIBS) $(HOST_LIBS) $(ICON_CLIENT) +osirion_LDADD = $(top_builddir)/src/client/libclient.la \ + $(top_builddir)/src/core/libcore.la $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la \ + $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/render/librender.la \ + $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/sys/libsys.la \ + $(top_builddir)/src/auxiliary/libauxiliary.la + $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/sys/libsys.la \ + $(top_builddir)/src/auxiliary/libauxiliary.la $(GL_LIBS) $(HOST_LIBS) $(ICON_CLIENT) osirion_LDFLAGS = $(LIBSDL_LIBS) |