diff options
| author | Pierre Ossman <ossman@cendio.se> | 2006-05-25 13:31:28 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2006-05-25 13:31:28 +0000 |
| commit | 1799b7ac332e0309437c41c676358078cc1f659c (patch) | |
| tree | bbb298be1e385b8854a950d596794d63b1fd1141 /src | |
| parent | fc8a2c4a3616a9a97eeb60e22065615f5c13e888 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6327d550..a298397b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -174,24 +174,6 @@ pabrowse_LDADD = $(AM_LDADD) libpolyp.la libpolyp-browse.la pabrowse_CFLAGS = $(AM_CFLAGS) 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 # ################################### @@ -344,7 +326,7 @@ polypinclude_HEADERS += \ endif endif -lib_LTLIBRARIES += \ +lib_LTLIBRARIES = \ libpolyp.la \ libpolyp-simple.la @@ -468,6 +450,29 @@ libpolyp_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB12_LIBS) 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 # ################################### |