new configuration subsystem

[pulseaudio] / polyp / Makefile.am

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index 3f94c052811efbb8e0b2273239d3c7b50d76c647..e9e1c295f81c7eba7d0d382e014dcbea59d4d39c 100644 (file)
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -24,23 +24,24 @@ modlibdir=$(libdir)/polypaudio-@PA_MAJORMINOR@
 
 AM_CFLAGS=-D_GNU_SOURCE -I$(top_srcdir) $(PTHREAD_CFLAGS)
 AM_CFLAGS+=-DDLSEARCHPATH=\"$(modlibdir)\"
-AM_CFLAGS+=-DDEFAULT_CONFIG_FILE=\"$(polypconfdir)/polypaudio.pa\"
+AM_CFLAGS+=-DDEFAULT_SCRIPT_FILE=\"$(polypconfdir)/default.pa\"
+AM_CFLAGS+=-DDEFAULT_CONFIG_FILE=\"$(polypconfdir)/config\"
 AM_CFLAGS+=-DPOLYPAUDIO_BINARY=\"$(bindir)/polypaudio\"
 
 AM_LDADD=$(PTHREAD_LIBS) -lm
 AM_LIBADD=$(PTHREAD_LIBS) -lm
 
-EXTRA_DIST = polypaudio.pa depmod.py esdcompat.sh.in
-bin_PROGRAMS = polypaudio pacat pactl pamodinfo
+EXTRA_DIST = default.pa config depmod.py esdcompat.sh.in
+bin_PROGRAMS = polypaudio pacat pactl
 bin_SCRIPTS = esdcompat.sh
 noinst_PROGRAMS = \
                mainloop-test \
                pacat-simple \
                parec-simple \
                cpulimit-test \
-               cpulimit-test2 
+               cpulimit-test2
 
-polypconf_DATA=polypaudio.pa 
+polypconf_DATA=default.pa config
 
 BUILT_SOURCES=polyplib-version.h
 
@@ -63,6 +64,11 @@ polypinclude_HEADERS= \
                sample.h \
                glib-mainloop.h
 
+### Warning! Due to an obscure bug in libtool/automake it is required
+### that the libraries in modlib_LTLIBRARIES are specified in-order,
+### i.e. libraries near the end of the list depend on libraries near
+### the head, and not the other way!
+
 modlib_LTLIBRARIES= \
                libsocket-util.la \
                libiochannel.la \
@@ -148,19 +154,15 @@ polypaudio_SOURCES = idxset.c idxset.h \
                cpulimit.c cpulimit.h \
                log.c log.h \
                gcc-printf.h \
-               modinfo.c modinfo.h 
+               modinfo.c modinfo.h \
+               conf.c conf.h \
+               dumpmodules.c dumpmodules.h
 
 polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
 polypaudio_INCLUDES = $(INCLTDL)
-polypaudio_LDADD = $(AM_LDADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS)
+polypaudio_LDADD = $(AM_LDADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(LEXLIB)
 polypaudio_LDFLAGS=-export-dynamic
 
-pamodinfo_SOURCES = log.c log.h pamodinfo.c pamodinfo.h modinfo.c modinfo.h util.c util.h xmalloc.c xmalloc.h
-pamodinfo_CFLAGS = $(AM_CFLAGS)
-pamodinfo_INCLUDES = $(INCLTDL)
-pamodinfo_LDADD = $(AM_LDADD) $(LIBLTDL)
-pamodinfo_LDFLAGS=-export-dynamic
-
 libprotocol_simple_la_SOURCES = protocol-simple.c protocol-simple.h
 libprotocol_simple_la_LDFLAGS = -avoid-version
 libprotocol_simple_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la
@@ -530,3 +532,7 @@ esdcompat.sh: esdcompat.sh.in Makefile
        sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@POLYPAUDIO_BINARY\@,$(bindir)/polypaudio,g' < $< > $@
+
+install-exec-hook:
+       chown root:root $(DESTDIR)$(bindir)/polypaudio
+       chmod u+s $(DESTDIR)$(bindir)/polypaudio