mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-16 08:56:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

* remove .a files from the modules directory after installation

Browse source 
* rename $(modlibdir) to $(modlibexecdir) in accordance with secion 11.2 of the automake docs ("The two parts of install")


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@883 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-05-16 15:29:58 +00:00
parent f272e598df
commit c12206b864
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/Makefile.am
View file

@ -26,7 +26,7 @@ polypincludedir=$(includedir)/polyp
polypcoreincludedir=$(includedir)/polypcore polypcoreincludedir=$(includedir)/polypcore
polypconfdir=$(sysconfdir)/polypaudio polypconfdir=$(sysconfdir)/polypaudio
modlibdir=$(libdir)/polypaudio modlibexecdir=$(libdir)/polypaudio
################################### ###################################
# Defines # # Defines #
@ -47,7 +47,7 @@ AM_CFLAGS = -I$(top_srcdir)/src
AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS
AM_CFLAGS += $(LTDLINCL) AM_CFLAGS += $(LTDLINCL)
AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
AM_CFLAGS += -DDLSEARCHPATH=\"$(modlibdir)\" AM_CFLAGS += -DDLSEARCHPATH=\"$(modlibexecdir)\"
#AM_CFLAGS += -DDLSEARCHPATH=\"$(shell pwd)\" #AM_CFLAGS += -DDLSEARCHPATH=\"$(shell pwd)\"
AM_CFLAGS += -DDEFAULT_CONFIG_DIR=\"$(DEFAULT_CONFIG_DIR)\" AM_CFLAGS += -DDEFAULT_CONFIG_DIR=\"$(DEFAULT_CONFIG_DIR)\"
AM_CFLAGS += -DPOLYPAUDIO_BINARY=\"$(POLYPAUDIO_BINARY)\" AM_CFLAGS += -DPOLYPAUDIO_BINARY=\"$(POLYPAUDIO_BINARY)\"
@ -113,7 +113,7 @@ polypaudio_LDADD = $(AM_LDADD) libpolypcore.la $(LIBLTDL) \
if PREOPEN_MODS if PREOPEN_MODS
PREOPEN_LIBS = $(PREOPEN_MODS) PREOPEN_LIBS = $(PREOPEN_MODS)
else else
PREOPEN_LIBS = $(modlib_LTLIBRARIES) PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
endif endif
if FORCE_PREOPEN if FORCE_PREOPEN
@ -589,11 +589,11 @@ polypcoreinclude_HEADERS += \
polypcore/protocol-http.h polypcore/protocol-http.h
### Warning! Due to an obscure bug in libtool/automake it is required ### Warning! Due to an obscure bug in libtool/automake it is required
### that the libraries in modlib_LTLIBRARIES are specified in-order, ### that the libraries in modlibexec_LTLIBRARIES are specified in-order,
### i.e. libraries near the end of the list depend on libraries near ### i.e. libraries near the end of the list depend on libraries near
### the head, and not the other way! ### the head, and not the other way!
modlib_LTLIBRARIES = \ modlibexec_LTLIBRARIES = \
libsocket-util.la \ libsocket-util.la \
libiochannel.la \ libiochannel.la \
libsocket-server.la \ libsocket-server.la \
@ -617,7 +617,7 @@ modlib_LTLIBRARIES = \
# We need to emulate sendmsg/recvmsg to support this on Win32 # We need to emulate sendmsg/recvmsg to support this on Win32
if !OS_IS_WIN32 if !OS_IS_WIN32
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
librtp.la librtp.la
endif endif
@ -626,7 +626,7 @@ polypcoreinclude_HEADERS += \
polypcore/x11wrap.h \ polypcore/x11wrap.h \
polypcore/x11prop.h polypcore/x11prop.h
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
libx11wrap.la \ libx11wrap.la \
libx11prop.la libx11prop.la
endif endif
@ -736,7 +736,7 @@ libx11prop_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS
# Plug-in libraries # # Plug-in libraries #
################################### ###################################
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-cli.la \ module-cli.la \
module-cli-protocol-tcp.la \ module-cli-protocol-tcp.la \
module-simple-protocol-tcp.la \ module-simple-protocol-tcp.la \
@ -755,13 +755,13 @@ modlib_LTLIBRARIES += \
# See comment at librtp.la above # See comment at librtp.la above
if !OS_IS_WIN32 if !OS_IS_WIN32
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-rtp-send.la \ module-rtp-send.la \
module-rtp-recv.la module-rtp-recv.la
endif endif
if HAVE_AF_UNIX if HAVE_AF_UNIX
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-cli-protocol-unix.la \ module-cli-protocol-unix.la \
module-simple-protocol-unix.la \ module-simple-protocol-unix.la \
module-esound-protocol-unix.la \ module-esound-protocol-unix.la \
@ -770,71 +770,71 @@ modlib_LTLIBRARIES += \
endif endif
if HAVE_MKFIFO if HAVE_MKFIFO
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-pipe-sink.la \ module-pipe-sink.la \
module-pipe-source.la module-pipe-source.la
endif endif
if !OS_IS_WIN32 if !OS_IS_WIN32
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-esound-compat-spawnfd.la \ module-esound-compat-spawnfd.la \
module-esound-compat-spawnpid.la module-esound-compat-spawnpid.la
endif endif
if HAVE_REGEX if HAVE_REGEX
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-match.la module-match.la
endif endif
if HAVE_X11 if HAVE_X11
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-x11-bell.la \ module-x11-bell.la \
module-x11-publish.la module-x11-publish.la
endif endif
if HAVE_OSS if HAVE_OSS
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
liboss-util.la \ liboss-util.la \
module-oss.la \ module-oss.la \
module-oss-mmap.la module-oss-mmap.la
endif endif
if HAVE_ALSA if HAVE_ALSA
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
libalsa-util.la \ libalsa-util.la \
module-alsa-sink.la \ module-alsa-sink.la \
module-alsa-source.la module-alsa-source.la
endif endif
if HAVE_SOLARIS if HAVE_SOLARIS
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-solaris.la module-solaris.la
endif endif
if HAVE_HOWL if HAVE_HOWL
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
libhowl-wrap.la \ libhowl-wrap.la \
module-zeroconf-publish.la module-zeroconf-publish.la
endif endif
if HAVE_LIRC if HAVE_LIRC
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-lirc.la module-lirc.la
endif endif
if HAVE_EVDEV if HAVE_EVDEV
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-mmkbd-evdev.la module-mmkbd-evdev.la
endif endif
if HAVE_JACK if HAVE_JACK
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-jack-sink.la \ module-jack-sink.la \
module-jack-source.la module-jack-source.la
endif endif
if OS_IS_WIN32 if OS_IS_WIN32
modlib_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-waveout.la module-waveout.la
endif endif
@ -1153,10 +1153,11 @@ default.pa: daemon/default.pa.in Makefile
endif endif
daemon.conf: daemon/daemon.conf.in Makefile daemon.conf: daemon/daemon.conf.in Makefile
sed -e 's,@DLSEARCHPATH\@,$(modlibdir),g' \ sed -e 's,@DLSEARCHPATH\@,$(modlibexecdir),g' \
-e 's,@DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@ -e 's,@DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
install-exec-hook: install-exec-hook:
chown root $(DESTDIR)$(bindir)/polypaudio ; true chown root $(DESTDIR)$(bindir)/polypaudio ; true
chmod u+s $(DESTDIR)$(bindir)/polypaudio chmod u+s $(DESTDIR)$(bindir)/polypaudio
ln -sf pacat $(DESTDIR)$(bindir)/parec ln -sf pacat $(DESTDIR)$(bindir)/parec
rm -f $(DESTDIR)$(modlibexecdir)/*.a