[polypaudio-commits] r968 - /trunk/src/Makefile.am

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Thu May 25 15:31:28 2006
New Revision: 968

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=968&root=polypaudio&view=rev
Log:
Move libpolypdsp in the makefile to avoid the libtool bug where it must come
after any things it depends on.

Modified:
    trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=968&root=polypaudio&r1=967&r2=968&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu May 25 15:31:28 2006
@@ -173,24 +173,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, at LIBPOLYPDSP\@,$(libdir)/libpolypdsp.so,g' < $< > $@
-
-endif
 
 ###################################
 #         Test programs           #
@@ -344,7 +326,7 @@
 endif
 endif
 
-lib_LTLIBRARIES += \
+lib_LTLIBRARIES = \
 		libpolyp.la \
 		libpolyp-simple.la
 
@@ -466,6 +448,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_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, at LIBPOLYPDSP\@,$(libdir)/libpolypdsp.so,g' < $< > $@
 
 ###################################
 #      Daemon core library        #