diff options
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dc49bc19..f3717cec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,21 +27,23 @@ pulseincludedir=$(includedir)/pulse pulsecoreincludedir=$(includedir)/pulsecore pulseconfdir=$(sysconfdir)/pulse pulselibexecdir=$(libexecdir)/pulse +if HAVE_X11 xdgautostartdir=$(sysconfdir)/xdg/autostart +endif +if HAVE_ALSA alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths +endif +if HAVE_DBUS dbuspolicydir=$(sysconfdir)/dbus-1/system.d +endif ################################### # Defines # ################################### PA_BINARY=$(bindir)/pulseaudio$(EXEEXT) -if OS_IS_WIN32 -PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT% -else PA_DEFAULT_CONFIG_DIR=$(pulseconfdir) -endif ################################### # Compiler/linker flags # @@ -125,9 +127,9 @@ if HAVE_X11 xdgautostart_in_files = \ daemon/pulseaudio.desktop.in \ daemon/pulseaudio-kde.desktop.in -endif xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ +endif ################################### @@ -592,8 +594,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/flist.c pulsecore/flist.h \ pulsecore/hashmap.c pulsecore/hashmap.h \ pulsecore/idxset.c pulsecore/idxset.h \ - pulsecore/inet_ntop.c pulsecore/inet_ntop.h \ - pulsecore/inet_pton.c pulsecore/inet_pton.h \ + pulsecore/arpa-inet.c pulsecore/arpa-inet.h \ pulsecore/iochannel.c pulsecore/iochannel.h \ pulsecore/ioline.c pulsecore/ioline.h \ pulsecore/ipacl.h pulsecore/ipacl.c \ @@ -1924,21 +1925,28 @@ 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' < $< > $@ +if OS_IS_WIN32 +SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp +else +SYMLINK_PROGRAM=ln -sf +endif install-exec-hook: +if HAVE_BLUEZ -chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper -chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper - ln -sf pacat $(DESTDIR)$(bindir)/parec - ln -sf pacat $(DESTDIR)$(bindir)/pamon - ln -sf pacat $(DESTDIR)$(bindir)/paplay - ln -sf pacat $(DESTDIR)$(bindir)/parecord +endif + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parecord$(EXEEXT) rm -f $(DESTDIR)$(libdir)/libpulsedsp.la rm -f $(DESTDIR)$(modlibexecdir)/*.la uninstall-hook: - rm -f $(DESTDIR)$(bindir)/parec - rm -f $(DESTDIR)$(bindir)/pamon - rm -f $(DESTDIR)$(bindir)/paplay - rm -f $(DESTDIR)$(bindir)/parecord + rm -f $(DESTDIR)$(bindir)/parec$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/pamon$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/paplay$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/parecord$(EXEEXT) rm -f $(DESTDIR)$(libdir)/libpulsedsp.* rm -f $(DESTDIR)$(modlibexecdir)/*.so @@ -1952,21 +1960,21 @@ update-ffmpeg: update-sbc: for i in $(BLUETOOTH_SBC_FILES) ; do \ wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \ - wget -O modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \ + wget -O $(top_srcdir)/src/modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \ done for i in $(BLUETOOTH_IPC_FILES); do \ wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \ - wget -O modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \ + wget -O $(top_srcdir)/src/modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \ done update-reserve: for i in reserve.c reserve.h reserve-monitor.c reserve-monitor.h ; do \ - wget -O modules/$$i http://git.0pointer.de/\?p=reserve.git\;a=blob_plain\;f=$$i\;hb=master ; \ + wget -O $(top_srcdir)/src/modules/$$i http://git.0pointer.de/\?p=reserve.git\;a=blob_plain\;f=$$i\;hb=master ; \ done update-rtkit: for i in rtkit.c rtkit.h ; do \ - wget -O pulsecore/$$i http://git.0pointer.de/\?p=rtkit.git\;a=blob_plain\;f=$$i\;hb=master ; \ + wget -O $(top_srcdir)/src/pulsecore/$$i http://git.0pointer.de/\?p=rtkit.git\;a=blob_plain\;f=$$i\;hb=master ; \ done # Automatically generate linker version script. We use the same one for all public .sos |