mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Use configure AC_OUTPUT to process config files

Browse source 
Don't use sed to replace @variable@ in file.in.
This commit is contained in:
Maarten Bosmans 2011-06-29 15:16:09 +02:00 • committed by Colin Guthrie
parent e42bc02dc6
commit 3722dbbcb3
3 changed files with 25 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

21
configure.ac
View file

@ -1216,8 +1216,29 @@ doxygen/Makefile
doxygen/doxygen.conf doxygen/doxygen.conf
src/pulse/version.h src/pulse/version.h
po/Makefile.in po/Makefile.in
man/pulseaudio.1.xml
man/esdcompat.1.xml
man/pax11publish.1.xml
man/paplay.1.xml
man/pacat.1.xml
man/pacmd.1.xml
man/pactl.1.xml
man/pasuspender.1.xml
man/padsp.1.xml
man/pulse-daemon.conf.5.xml
man/pulse-client.conf.5.xml
man/default.pa.5.xml
]) ])
AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat])
AC_CONFIG_FILES([src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in], [chmod +x src/start-pulseaudio-x11])
AC_CONFIG_FILES([src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in], [chmod +x src/start-pulseaudio-kde])
AC_CONFIG_FILES([src/client.conf:src/pulse/client.conf.in])
AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in])
AS_IF([test "x$os_is_win32" = "x1"], [config_source_ext=win32], [config_source_ext=in])
AC_CONFIG_FILES([src/default.pa:src/daemon/default.pa.$config_source_ext])
AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.$config_source_ext])
AC_OUTPUT AC_OUTPUT
# ========================================================================== # ==========================================================================

9
man/Makefile.am
View file

@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA. # USA.
CLEANFILES = \ DISTCLEANFILES = \
$(noinst_DATA) $(noinst_DATA)
noinst_DATA = \ noinst_DATA = \
@ -32,11 +32,6 @@ noinst_DATA = \
pulse-client.conf.5.xml \ pulse-client.conf.5.xml \
default.pa.5.xml default.pa.5.xml
%.xml: %.xml.in Makefile
$(AM_V_GEN) sed -e 's,@PA_DEFAULT_CONFIG_DIR\@,$(PA_DEFAULT_CONFIG_DIR),g' \
-e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
xmllint: $(noinst_DATA) xmllint: $(noinst_DATA)
for f in $(noinst_DATA) ; do \ for f in $(noinst_DATA) ; do \
xmllint --noout --valid "$$f" || exit 1 ; \ xmllint --noout --valid "$$f" || exit 1 ; \
@ -58,7 +53,7 @@ dist_man_MANS = \
pulse-client.conf.5 \ pulse-client.conf.5 \
default.pa.5 default.pa.5
CLEANFILES += \ CLEANFILES = \
$(dist_man_MANS) $(dist_man_MANS)
%: %.xml Makefile %: %.xml Makefile

42
src/Makefile.am
View file

@ -1875,46 +1875,8 @@ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
# Some minor stuff # # 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 CLEANFILES += daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde
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\@,$(PACTL_BINARY),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\@,$(PACTL_BINARY),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\@,$(PA_SOEXT),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\@,$(PA_SOEXT),g' < $< > $@
endif
daemon.conf: daemon/daemon.conf.in Makefile
$(AM_V_GEN) sed -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
-e 's,@PA_DEFAULT_CONFIG_DIR\@,$(PA_DEFAULT_CONFIG_DIR),g' < $< > $@
if OS_IS_WIN32 if OS_IS_WIN32
SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp