tDon't build and install empty .so files (e.g. libsound_winmm.so) any more. - v… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 985d70342383b164a1972aa3fd3bccbc58c3f07b | |
parent d5e203347aa5c6bf3cc11244f826d4b77a848535 | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 24 Jun 2002 11:37:50 +0000 | |
Don't build and install empty .so files (e.g. libsound_winmm.so) any more. | |
Diffstat: | |
M configure.in | 9 +++++++-- | |
M src/plugins/Makefile.am | 8 +++++++- | |
2 files changed, 14 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/configure.in b/configure.in | |
t@@ -80,6 +80,7 @@ if test "$CYGWIN" = "yes" ; then | |
dnl Add support for the Windows multimedia system | |
SOUND_LIBS="$SOUND_LIBS -lwinmm" | |
+ PLUGOBJS="$PLUGOBJS plugins/sound_winmm.o" | |
AC_DEFINE(HAVE_WINMM, 1, [Do we have the Windows multimedia system?]) | |
dnl The gtkport implementation works just fine | |
t@@ -166,9 +167,11 @@ else | |
if test "$ESD" = "yes"; then | |
SOUND_CFLAGS="$SOUND_CFLAGS $ESD_CFLAGS" | |
SOUND_LIBS="$SOUND_LIBS $ESD_LIBS" | |
+ PLUGOBJS="$PLUGOBJS plugins/sound_esd.o" | |
AC_SUBST(ESD_LIBS) | |
AC_DEFINE(HAVE_ESD, 1, [Do we have the ESD sound library?]) | |
fi | |
+ AM_CONDITIONAL(ESD, test "$ESD" = "yes") | |
dnl Add SDL_mixer sound support if available | |
SDL=no | |
t@@ -183,11 +186,13 @@ else | |
SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS" | |
SDL_LIBS="$SDL_LIBS -lSDL_mixer" | |
SOUND_LIBS="$SOUND_LIBS $SDL_LIBS" | |
+ PLUGOBJS="$PLUGOBJS plugins/sound_sdl.o" | |
AC_SUBST(SDL_LIBS) | |
AC_DEFINE(HAVE_SDL_MIXER, 1, [Do we have the SDL_mixer sound library?… | |
fi | |
fi | |
fi | |
+ AM_CONDITIONAL(SDL, test "$SDL" = "yes") | |
dnl Use console server by default | |
if test "$GUI_SERVER" = "probe"; then | |
t@@ -269,12 +274,12 @@ if test "$plugins" = "yes" ; then | |
DP_EXPAND_DIR(PLUGINDIR, '${plugindir}') | |
AC_DEFINE_UNQUOTED(PLUGINDIR, "$PLUGINDIR", | |
[The directory containing the plugins]) | |
+ PLUGOBJS="" | |
else | |
- PLUGOBJS="plugins/sound_sdl.o plugins/sound_esd.o plugins/sound_winmm.o" | |
- AC_SUBST(PLUGOBJS) | |
PLUGLIBS="$SOUND_LIBS" | |
AC_SUBST(PLUGLIBS) | |
fi | |
+AC_SUBST(PLUGOBJS) | |
AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes") | |
dnl Enable networking by default under Win32, but on Unix systems | |
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am | |
t@@ -10,7 +10,13 @@ LINKNOO = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFL… | |
if PLUGINS | |
PLUGINDIR = ${DESTDIR}${plugindir} | |
-PLUGINS = .libs/libsound_sdl.so .libs/libsound_esd.so .libs/libsound_winmm.so | |
+if ESD | |
+ESD_SO = .libs/libsound_esd.so | |
+endif | |
+if SDL | |
+SDL_SO = .libs/libsound_sdl.so | |
+endif | |
+PLUGINS = $(ESD_SO) $(SDL_SO) | |
all-local: ${PLUGINS} | |