From c6d7a198516e785a30fb5f5c12dcc68108a38059 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 31 May 2007 06:30:46 +0000 Subject: [PATCH] Move all the cd plugins into the audio subdir so things can be built in the correct order (as cd_file depends on libQFsound). --- libs/audio/Makefile.am | 42 ++++++++++++++++++++++++++++++--- libs/audio/cd/Makefile.am | 38 ----------------------------- libs/audio/{cd => }/cd_file.c | 0 libs/audio/{cd => }/cd_linux.c | 0 libs/audio/{cd => }/cd_sdl.c | 0 libs/audio/{cd => }/cd_sgi.c | 0 libs/audio/{cd => }/cd_win.c | 0 libs/audio/{cd => }/cd_xmms.c | 0 libs/audio/renderer/Makefile.am | 4 ++-- libs/audio/targets/Makefile.am | 10 ++++---- 10 files changed, 46 insertions(+), 48 deletions(-) delete mode 100644 libs/audio/cd/Makefile.am rename libs/audio/{cd => }/cd_file.c (100%) rename libs/audio/{cd => }/cd_linux.c (100%) rename libs/audio/{cd => }/cd_sdl.c (100%) rename libs/audio/{cd => }/cd_sgi.c (100%) rename libs/audio/{cd => }/cd_win.c (100%) rename libs/audio/{cd => }/cd_xmms.c (100%) diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am index 19762caaa..67ec349fb 100644 --- a/libs/audio/Makefile.am +++ b/libs/audio/Makefile.am @@ -1,14 +1,50 @@ AUTOMAKE_OPTIONS= foreign -SUBDIRS= cd targets renderer +SUBDIRS= targets renderer CFLAGS+= @PREFER_PIC@ INCLUDES= -I$(top_srcdir)/include +SDL_LIBS= @SDL_LIBS@ +XMMS_LIBS= @XMMS_LIBS@ +plugin_version= 1:0:0 +plugin_ldflags= @plugin_ldflags@ -module +plugin_libadd= @plugin_libadd@ +EXEEXT= +plugin_LTLIBRARIES= @CD_PLUGIN_TARGETS@ +noinst_LTLIBRARIES= @CD_PLUGIN_STATIC@ lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@ -EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la +EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la \ + cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la \ + cd_xmms.la + +cd_file_la_LDFLAGS= $(plugin_ldflags) +cd_file_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/audio/libQFsound.la +cd_file_la_SOURCES= cd_file.c + +cd_linux_la_LDFLAGS= $(plugin_ldflags) +cd_linux_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la +cd_linux_la_SOURCES= cd_linux.c + +cd_sdl_la_LDFLAGS= $(plugin_ldflags) +cd_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la +cd_sdl_la_CFLAGS= $(SDL_CFLAGS) +cd_sdl_la_SOURCES= cd_sdl.c + +cd_sgi_la_LDFLAGS= $(plugin_ldflags) +cd_sgi_la_LIBADD= $(SGI_CD_LIBS) +cd_sgi_la_SOURCES= cd_sgi.c + +cd_win_la_LDFLAGS= $(plugin_ldflags) +cd_win_la_LIBADD= $(plugin_libadd) +cd_win_la_SOURCES= cd_win.c + +cd_xmms_la_LDFLAGS= $(plugin_ldflags) +cd_xmms_la_LIBADD= $(XMMS_LIBS) $(top_builddir)/libs/util/libQFutil.la +cd_xmms_la_CFLAGS= $(XMMS_CFLAGS) +cd_xmms_la_SOURCES= cd_xmms.c libQFsound_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) -libQFsound_la_LIBADD= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ $(top_builddir)/libs/util/libQFutil.la +libQFsound_la_LIBADD= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/engine/libQFgamecode.la libQFsound_la_SOURCES= snd.c snd_progs.c libQFsound_la_DEPENDENCIES= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ diff --git a/libs/audio/cd/Makefile.am b/libs/audio/cd/Makefile.am deleted file mode 100644 index f91818383..000000000 --- a/libs/audio/cd/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -CFLAGS+= @PREFER_PIC@ -INCLUDES= -I$(top_srcdir)/include -SDL_LIBS= @SDL_LIBS@ -XMMS_LIBS= @XMMS_LIBS@ -plugin_version= 1:0:0 -plugin_ldflags= @plugin_ldflags@ -module -plugin_libadd= @plugin_libadd@ -EXEEXT= - -plugin_LTLIBRARIES= @CD_PLUGIN_TARGETS@ -noinst_LTLIBRARIES= @CD_PLUGIN_STATIC@ -EXTRA_LTLIBRARIES= cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la cd_xmms.la - -cd_file_la_LDFLAGS= $(plugin_ldflags) -cd_file_la_SOURCES= cd_file.c - -cd_linux_la_LDFLAGS= $(plugin_ldflags) -cd_linux_la_SOURCES= cd_linux.c - -cd_sdl_la_LDFLAGS= $(plugin_ldflags) -cd_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd) -cd_sdl_la_CFLAGS= $(SDL_CFLAGS) -cd_sdl_la_SOURCES= cd_sdl.c - -cd_sgi_la_LDFLAGS= $(plugin_ldflags) -cd_sgi_la_LIBADD= $(SGI_CD_LIBS) -cd_sgi_la_SOURCES= cd_sgi.c - -cd_win_la_LDFLAGS= $(plugin_ldflags) -cd_win_la_LIBADD= $(plugin_libadd) -cd_win_la_SOURCES= cd_win.c - -cd_xmms_la_LDFLAGS= $(plugin_ldflags) -cd_xmms_la_LIBADD= $(XMMS_LIBS) -cd_xmms_la_CFLAGS= $(XMMS_CFLAGS) -cd_xmms_la_SOURCES= cd_xmms.c diff --git a/libs/audio/cd/cd_file.c b/libs/audio/cd_file.c similarity index 100% rename from libs/audio/cd/cd_file.c rename to libs/audio/cd_file.c diff --git a/libs/audio/cd/cd_linux.c b/libs/audio/cd_linux.c similarity index 100% rename from libs/audio/cd/cd_linux.c rename to libs/audio/cd_linux.c diff --git a/libs/audio/cd/cd_sdl.c b/libs/audio/cd_sdl.c similarity index 100% rename from libs/audio/cd/cd_sdl.c rename to libs/audio/cd_sdl.c diff --git a/libs/audio/cd/cd_sgi.c b/libs/audio/cd_sgi.c similarity index 100% rename from libs/audio/cd/cd_sgi.c rename to libs/audio/cd_sgi.c diff --git a/libs/audio/cd/cd_win.c b/libs/audio/cd_win.c similarity index 100% rename from libs/audio/cd/cd_win.c rename to libs/audio/cd_win.c diff --git a/libs/audio/cd/cd_xmms.c b/libs/audio/cd_xmms.c similarity index 100% rename from libs/audio/cd/cd_xmms.c rename to libs/audio/cd_xmms.c diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am index 9a132ca2d..48cd5f50b 100644 --- a/libs/audio/renderer/Makefile.am +++ b/libs/audio/renderer/Makefile.am @@ -17,10 +17,10 @@ snd_common=snd_channels.c snd_mem.c snd_mix.c snd_resample.c snd_sfx.c \ snd_render_default_la_LDFLAGS= $(plugin_ldflags) snd_render_default_la_SOURCES= snd_dma.c $(snd_common) -snd_render_default_la_LIBADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(LIBFLAC_LIBS) $(OGG_LIBS) $(WM_LIBS) +snd_render_default_la_LIBADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(LIBFLAC_LIBS) $(OGG_LIBS) $(WM_LIBS) $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/models/libQFmodels.la snd_render_default_la_DEPENDENCIES= snd_render_jack_la_LDFLAGS= $(plugin_ldflags) snd_render_jack_la_SOURCES= snd_jack.c $(snd_common) -snd_render_jack_la_LIBADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(LIBFLAC_LIBS) $(OGG_LIBS) $(WM_LIBS) $(JACK_LIBS) +snd_render_jack_la_LIBADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(LIBFLAC_LIBS) $(OGG_LIBS) $(WM_LIBS) $(JACK_LIBS) $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/models/libQFmodels.la snd_render_jack_la_DEPENDENCIES= diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am index fbcb10b0d..9112d2adb 100644 --- a/libs/audio/targets/Makefile.am +++ b/libs/audio/targets/Makefile.am @@ -16,22 +16,22 @@ EXTRA_LTLIBRARIES= \ snd_output_win.la snd_output_dx.la snd_output_disk.la snd_output_sdl_la_LDFLAGS= $(plugin_ldflags) -snd_output_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd) +snd_output_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la snd_output_sdl_la_CFLAGS= $(SDL_CFLAGS) snd_output_sdl_la_SOURCES= snd_sdl.c snd_output_alsa_la_LDFLAGS= $(plugin_ldflags) -snd_output_alsa_la_LIBADD= +snd_output_alsa_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la snd_output_alsa_la_CFLAGS= $(ALSA_CFLAGS) snd_output_alsa_la_SOURCES= snd_alsa.c snd_output_alsa0_9_la_LDFLAGS= $(plugin_ldflags) -snd_output_alsa0_9_la_LIBADD= +snd_output_alsa0_9_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la snd_output_alsa0_9_la_CFLAGS= $(ALSA_CFLAGS) snd_output_alsa0_9_la_SOURCES= snd_alsa_0_9.c snd_output_oss_la_LDFLAGS= $(plugin_ldflags) -snd_output_oss_la_LIBADD= $(OSS_LIBS) +snd_output_oss_la_LIBADD= $(OSS_LIBS) $(top_builddir)/libs/util/libQFutil.la snd_output_oss_la_CFLAGS= $(OSS_CFLAGS) snd_output_oss_la_SOURCES= snd_oss.c @@ -55,6 +55,6 @@ snd_output_dx_la_CFLAGS= $(WIN32SND_CFLAGS) snd_output_dx_la_SOURCES= snd_dx.c snd_output_disk_la_LDFLAGS= $(plugin_ldflags) -snd_output_disk_la_LIBADD= $(plugin_libadd) +snd_output_disk_la_LIBADD= $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la snd_output_disk_la_CFLAGS= snd_output_disk_la_SOURCES= snd_disk.c