Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-06-14 10:19:44 +0000
committerStijn Buys <ingar@osirion.org>2008-06-14 10:19:44 +0000
commit7b07ebcb0351cef57aa2397f49ef25979fab7472 (patch)
tree9d3cdabc6b0ac726035488d064db9c68dc4e9741 /src
parentd9aff6e24a0b0cb650331c77ab724eb8b0109bd6 (diff)
updated automake project files
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/audio/Makefile.am6
-rw-r--r--src/client/Makefile.am8
-rw-r--r--src/render/Makefile.am6
4 files changed, 20 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f82bdd..7385b2f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ if BUILD_CLIENT
MAYBE_CLIENT_SUBDIRS = audio render client
endif
-SUBDIRS = sys math auxiliary filesystem model core server $(MAYBE_CLIENT_SUBDIRS) game
+SUBDIRS = sys math auxiliary filesystem model core server audio render client game
noinst_HEADERS = config.h
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index f1116d8..62c482d 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -1,6 +1,12 @@
INCLUDES = -I$(top_srcdir)/src
METASOURCES = AUTO
+
+if BUILD_DEDICATED
+noinst_LTLIBRARIES =
+else
noinst_LTLIBRARIES = libaudio.la
+endif
+
libaudio_la_LDFLAGS = -avoid-version -no-undefined
noinst_HEADERS = audio.h buffers.h pcm.h sources.h wav.h
libaudio_la_SOURCES = audio.cc buffers.cc pcm.cc sources.cc wav.cc
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 56a2cc2..629102f 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,11 +1,17 @@
METASOURCES = AUTO
INCLUDES = -I$(top_srcdir)/src
+if BUILD_DEDICATED
+noinst_LTLIBRARIES =
+else
+noinst_LTLIBRARIES = libclient.la
+endif
+
libclient_la_SOURCES = chat.cc client.cc console.cc hud.cc input.cc key.cc \
keyboard.cc radar.cc video.cc view.cc
libclient_la_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS)
libclient_la_LDFLAGS = -avoid-version -no-undefined $(GL_LIBS) $(LIBSDL_LIBS)
-noinst_LTLIBRARIES = libclient.la
+
noinst_HEADERS = chat.h client.h console.h input.h key.h keyboard.h radar.h \
video.h view.h
libclient_la_LIBADD = $(top_builddir)/src/render/librender.la \
diff --git a/src/render/Makefile.am b/src/render/Makefile.am
index 389c141..166aa99 100644
--- a/src/render/Makefile.am
+++ b/src/render/Makefile.am
@@ -1,6 +1,12 @@
INCLUDES = -I$(top_srcdir)/src
METASOURCES = AUTO
+
+if BUILD_DEDICATED
+noinst_LTLIBRARIES =
+else
noinst_LTLIBRARIES = librender.la
+endif
+
librender_la_LDFLAGS = -avoid-version -no-undefined @GL_LIBS@
librender_la_LIBADD = $(top_builddir)/src/math/libmath.la
librender_la_SOURCES = camera.cc draw.cc gl.cc image.cc render.cc text.cc \