From eb833da5700048953837bc75d42575ac771b2e67 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Sun, 27 Feb 2011 23:09:52 +0100 Subject: Find modules and config files relative to the installed libraries. Do not use replace %PULSE_ROOT% from the environment. --- src/Makefile.am | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index d49d91c7..b57172b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,11 +37,7 @@ dbuspolicydir=$(sysconfdir)/dbus-1/system.d ################################### 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 # -- cgit From 74c934b1ada4c5e7d0efc690dc41d305abc2e58a Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Sun, 27 Feb 2011 23:43:54 +0100 Subject: build: copy instead of link pacat to other utils on win32 This is necessary as symlinks are not supported on Windows. Also use the $(EXEEXT) variable. --- src/Makefile.am | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index b57172b9..9de5d4f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1896,21 +1896,26 @@ daemon.conf: daemon/daemon.conf.in Makefile 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: -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 + $(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 -- cgit From 09d7baec645c8720b9ba71fc1e8db6b35c3da943 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 15 Mar 2011 12:30:42 +0100 Subject: build: Protect some more variables by ifdefs This avoids empty directories being created on builds without X11, ALSA, etc. --- src/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 9de5d4f1..2d73b72c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,10 +27,16 @@ 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 # @@ -117,9 +123,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 ################################### @@ -1902,8 +1908,10 @@ 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 +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) -- cgit From c470680e1ba008c05c13231dbbafd69cb9330488 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 1 Mar 2011 16:06:19 +0100 Subject: Use pulsecore/arpa-inet.h to make arpa/inet.h functionality available Automatically use replacement function on platforms (win32) where not all arpa/inet.h is available natively. --- src/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 2d73b72c..f160c944 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -597,8 +597,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 \ -- cgit