build-sys: Use configure AC_OUTPUT to process config files

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a37e202fd5b6d49067d144ca0fb5e355e1dcd245..c2b8224ae532dbecab15efff8a4f5e24adaf89ae 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,6 @@
 
 pulseincludedir=$(includedir)/pulse
 pulsecoreincludedir=$(includedir)/pulsecore
-pulseconfdir=$(sysconfdir)/pulse
 pulselibexecdir=$(libexecdir)/pulse
 if HAVE_X11
 xdgautostartdir=$(sysconfdir)/xdg/autostart
@@ -38,13 +37,6 @@ if HAVE_DBUS
 dbuspolicydir=$(sysconfdir)/dbus-1/system.d
 endif
 
-###################################
-#            Defines              #
-###################################
-
-PA_BINARY=$(bindir)/pulseaudio$(EXEEXT)
-PA_DEFAULT_CONFIG_DIR=$(pulseconfdir)
-
 ###################################
 #     Compiler/linker flags       #
 ###################################
@@ -53,17 +45,7 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/modules \
        -I$(top_builddir)/src/modules \
-       $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
-       -DPA_BUILDDIR=\"$(abs_builddir)\" \
-       -DPA_DLSEARCHPATH=\"$(modlibexecdir)\" \
-       -DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\" \
-       -DPA_BINARY=\"$(PA_BINARY)\" \
-       -DPA_SYSTEM_RUNTIME_PATH=\"$(PA_SYSTEM_RUNTIME_PATH)\" \
-       -DPA_SYSTEM_CONFIG_PATH=\"$(PA_SYSTEM_CONFIG_PATH)\" \
-       -DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" \
-       -DAO_REQUIRE_CAS \
-       -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
-       -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \
+       $(PTHREAD_CFLAGS) \
        -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
        -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
 
@@ -86,7 +68,7 @@ endif
 
 FOREIGN_CFLAGS = -w
 
-MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED)
+MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version $(NOUNDEFINED_LDFLAGS)
 MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
 
 ###################################
@@ -1088,7 +1070,8 @@ dist_alsaprofilesets_DATA = \
                modules/alsa/mixer/profile-sets/native-instruments-traktor-audio6.conf \
                modules/alsa/mixer/profile-sets/native-instruments-traktor-audio10.conf \
                modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \
-               modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf
+               modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \
+               modules/alsa/mixer/profile-sets/usb-headset.conf
 
 if HAVE_UDEV
 dist_udevrules_DATA = \
@@ -1892,46 +1875,8 @@ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 #        Some minor stuff         #
 ###################################
 
-CLEANFILES += esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
-
-esdcompat: daemon/esdcompat.in Makefile
-       $(AM_V_GEN) sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-               -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-               -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@
-       $(AM_V_at) chmod +x esdcompat
-
-start-pulseaudio-x11: daemon/start-pulseaudio-x11.in Makefile
-       $(AM_V_GEN) sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
-               -e 's,@PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@
-       $(AM_V_at) chmod +x start-pulseaudio-x11
-
-start-pulseaudio-kde: daemon/start-pulseaudio-kde.in Makefile
-       $(AM_V_GEN) sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
-               -e 's,@PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@
-       $(AM_V_at) chmod +x start-pulseaudio-kde
-
-client.conf: pulse/client.conf.in Makefile
-       $(AM_V_GEN) sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@
-
-if OS_IS_WIN32
-default.pa: daemon/default.pa.win32
-       cp $< $@
-system.pa: daemon/default.pa.win32
-       cp $< $@
-else
-default.pa: daemon/default.pa.in Makefile
-       $(AM_V_GEN) sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
-            -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
-           -e 's,@PA_SOEXT\@,.so,g' < $< > $@
-system.pa: daemon/system.pa.in Makefile
-       $(AM_V_GEN) sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
-            -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
-           -e 's,@PA_SOEXT\@,.so,g' < $< > $@
-endif
-
-daemon.conf: daemon/daemon.conf.in Makefile
-       $(AM_V_GEN) sed -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
-               -e 's,@PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
+CLEANFILES += daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
+DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde
 
 if OS_IS_WIN32
 SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp