From edf4b85cc7477ad35fdac1f38947cb05169e1256 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 15 Aug 2001 22:31:07 +0000 Subject: [PATCH] don't need to (and seems that you shouldn't) specify a path for local libs --- libs/audio/targets/Makefile.am | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am index ecf37c28a..1c834df9b 100644 --- a/libs/audio/targets/Makefile.am +++ b/libs/audio/targets/Makefile.am @@ -8,8 +8,6 @@ else SND_RENDERER = endif -SND_RENDERER_LIB = $(top_builddir)/libs/audio/targets/libQFsoundrenderer.la - lib_LTLIBRARIES = $(SND_RENDERER) @SND_PLUGIN_TARGETS@ EXTRA_LTLIBRARIES = libsound_sdl.la libsound_alsa0_5.la libsound_alsa0_9.la libsound_oss.la libsound_sgi.la libsound_sun.la libsound_win.la libsound_null.la libsound_disk.la @@ -31,57 +29,57 @@ libQFsoundrenderer.la: $(libQFsoundrenderer_la_OBJECTS) $(libQFsoundrenderer_la_ libsound_sdl_la_LDFLAGS= -version-info 1:0:0 $(SDL_LIBS) -lQFsoundrenderer -libsound_sdl_la_LIBS = $(SND_RENDERER_LIB) -libsound_sdl_la_LIB_DEPS= $(SND_RENDERER_LIB) +libsound_sdl_la_LIBS = $(SND_RENDERER) +libsound_sdl_la_LIB_DEPS= $(SND_RENDERER) libsound_sdl_la_SOURCES= snd_sdl.c libsound_sdl.la: $(libsound_sdl_la_OBJECTS) $(libsound_sdl_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsound_sdl_la_LDFLAGS) $(libsound_sdl_la_OBJECTS) $(libsound_sdl_la_LIBADD) $(LIBS) libsound_alsa0_5_la_LDFLAGS= -version-info 1:0:0 $(ALSA_LIBS) -lQFsoundrenderer -libsound_alsa0_5_la_LIBS = $(SND_RENDERER_LIB) -libsound_alsa0_5_la_LIB_DEPS= $(SND_RENDERER_LIB) +libsound_alsa0_5_la_LIBS = $(SND_RENDERER) +libsound_alsa0_5_la_LIB_DEPS= $(SND_RENDERER) libsound_alsa0_5_la_SOURCES= snd_alsa_0_5.c libsound_alsa0_5.la: $(libsound_alsa0_5_la_OBJECTS) $(libsound_alsa0_5_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsound_alsa0_5_la_LDFLAGS) $(libsound_alsa0_5_la_OBJECTS) $(libsound_alsa0_5_la_LIBADD) $(LIBS) libsound_alsa0_9_la_LDFLAGS= -version-info 1:0:0 $(ALSA_LIBS) -lQFsoundrenderer -libsound_alsa0_9_la_LIBS = $(SND_RENDERER_LIB) -libsound_alsa0_9_la_LIB_DEPS= $(SND_RENDERER_LIB) +libsound_alsa0_9_la_LIBS = $(SND_RENDERER) +libsound_alsa0_9_la_LIB_DEPS= $(SND_RENDERER) libsound_alsa0_9_la_SOURCES= snd_alsa_0_9.c libsound_alsa0_9.la: $(libsound_alsa0_9_la_OBJECTS) $(libsound_alsa0_9_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsound_alsa0_9_la_LDFLAGS) $(libsound_alsa0_9_la_OBJECTS) $(libsound_alsa0_9_la_LIBADD) $(LIBS) libsound_oss_la_LDFLAGS= -version-info 1:0:0 $(OSS_LIBS) -lQFsoundrenderer -libsound_oss_la_LIBS = $(SND_RENDERER_LIB) -libsound_oss_la_LIB_DEPS= $(SND_RENDERER_LIB) +libsound_oss_la_LIBS = $(SND_RENDERER) +libsound_oss_la_LIB_DEPS= $(SND_RENDERER) libsound_oss_la_SOURCES= snd_oss.c libsound_oss.la: $(libsound_oss_la_OBJECTS) $(libsound_oss_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsound_oss_la_LDFLAGS) $(libsound_oss_la_OBJECTS) $(libsound_oss_la_LIBADD) $(LIBS) libsound_sgi_la_LDFLAGS= -version-info 1:0:0 $(SGISND_LIBS) -lQFsoundrenderer -libsound_sgi_la_LIBS = $(SND_RENDERER_LIB) -libsound_sgi_la_LIB_DEPS= $(SND_RENDERER_LIB) +libsound_sgi_la_LIBS = $(SND_RENDERER) +libsound_sgi_la_LIB_DEPS= $(SND_RENDERER) libsound_sgi_la_SOURCES= snd_sgi.c libsound_sgi.la: $(libsound_sgi_la_OBJECTS) $(libsound_sgi_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsound_sgi_la_LDFLAGS) $(libsound_sgi_la_OBJECTS) $(libsound_sgi_la_LIBADD) $(LIBS) libsound_sun_la_LDFLAGS= -version-info 1:0:0 $(SUN_LIBS) -lQFsoundrenderer -libsound_sun_la_LIBS = $(SND_RENDERER_LIB) -libsound_sun_la_LIB_DEPS= $(SND_RENDERER_LIB) +libsound_sun_la_LIBS = $(SND_RENDERER) +libsound_sun_la_LIB_DEPS= $(SND_RENDERER) libsound_sun_la_SOURCES= snd_sun.c libsound_sun.la: $(libsound_sun_la_OBJECTS) $(libsound_sun_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsound_sun_la_LDFLAGS) $(libsound_sun_la_OBJECTS) $(libsound_sun_la_LIBADD) $(LIBS) libsound_win_la_LDFLAGS= -version-info 1:0:0 $(WIN_LIBS) -lQFsoundrenderer -libsound_win_la_LIBS = $(SND_RENDERER_LIB) -libsound_win_la_LIB_DEPS= $(SND_RENDERER_LIB) +libsound_win_la_LIBS = $(SND_RENDERER) +libsound_win_la_LIB_DEPS= $(SND_RENDERER) libsound_win_la_SOURCES= snd_win.c libsound_win.la: $(libsound_win_la_OBJECTS) $(libsound_win_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsound_win_la_LDFLAGS) $(libsound_win_la_OBJECTS) $(libsound_win_la_LIBADD) $(LIBS) libsound_disk_la_LDFLAGS= -version-info 1:0:0 -lQFsoundrenderer -libsound_disk_la_LIBS = $(SND_RENDERER_LIB) -libsound_disk_la_LIB_DEPS= $(SND_RENDERER_LIB) +libsound_disk_la_LIBS = $(SND_RENDERER) +libsound_disk_la_LIB_DEPS= $(SND_RENDERER) libsound_disk_la_SOURCES= snd_disk.c libsound_disk.la: $(libsound_disk_la_OBJECTS) $(libsound_disk_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsound_disk_la_LDFLAGS) $(libsound_disk_la_OBJECTS) $(libsound_disk_la_LIBADD) $(LIBS)