Move libpolypdsp in the makefile to avoid the libtool bug where it must come

after any things it depends on.


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@968 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-05-25 13:31:28 +00:00
parent fc8a2c4a36
commit 1799b7ac33

View file

@ -174,24 +174,6 @@ pabrowse_LDADD = $(AM_LDADD) libpolyp.la libpolyp-browse.la
pabrowse_CFLAGS = $(AM_CFLAGS) pabrowse_CFLAGS = $(AM_CFLAGS)
pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
lib_LTLIBRARIES =
CLEANFILES=
if HAVE_OSS
lib_LTLIBRARIES += libpolypdsp.la
libpolypdsp_la_SOURCES = utils/padsp.c
libpolypdsp_la_CFLAGS = $(AM_CFLAGS)
libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la
libpolypdsp_la_LDFLAGS = -avoid-version
CLEANFILES+=padsp
bin_SCRIPTS += padsp
padsp: utils/padsp.in Makefile
sed -e 's,@LIBPOLYPDSP\@,$(libdir)/libpolypdsp.so,g' < $< > $@
endif
################################### ###################################
# Test programs # # Test programs #
################################### ###################################
@ -344,7 +326,7 @@ polypinclude_HEADERS += \
endif endif
endif endif
lib_LTLIBRARIES += \ lib_LTLIBRARIES = \
libpolyp.la \ libpolyp.la \
libpolyp-simple.la libpolyp-simple.la
@ -467,6 +449,29 @@ libpolyp_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
libpolyp_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB12_LIBS) libpolyp_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB12_LIBS)
libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO) libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
###################################
# OSS emulation #
###################################
CLEANFILES=
if HAVE_OSS
lib_LTLIBRARIES += libpolypdsp.la
CLEANFILES += padsp
bin_SCRIPTS += padsp
endif
libpolypdsp_la_SOURCES = utils/padsp.c
libpolypdsp_la_CFLAGS = $(AM_CFLAGS)
libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la
libpolypdsp_la_LDFLAGS = -avoid-version
padsp: utils/padsp.in Makefile
sed -e 's,@LIBPOLYPDSP\@,$(libdir)/libpolypdsp.so,g' < $< > $@
################################### ###################################
# Daemon core library # # Daemon core library #
################################### ###################################