From 249384c7a2bf0f17f8869998ea019c9d3d22b0da Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Mon, 14 Mar 2011 14:05:04 +0100 Subject: osx: re-order module locations move all Mac OS X related modules to own location. --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 78ee231f..ff98ddb1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1541,13 +1541,13 @@ module_oss_la_LIBADD = $(MODULE_LIBADD) liboss-util.la # COREAUDIO -module_coreaudio_detect_la_SOURCES = modules/coreaudio/module-coreaudio-detect.c +module_coreaudio_detect_la_SOURCES = modules/macosx/module-coreaudio-detect.c module_coreaudio_detect_la_LDFLAGS = $(MODULE_LDFLAGS) \ -Wl,-framework -Wl,Cocoa -framework CoreAudio \ -Wl,-framework -Wl,AudioUnit -framework AudioUnit module_coreaudio_detect_la_LIBADD = $(MODULE_LIBADD) -module_coreaudio_device_la_SOURCES = modules/coreaudio/module-coreaudio-device.c +module_coreaudio_device_la_SOURCES = modules/macosx/module-coreaudio-device.c module_coreaudio_device_la_LDFLAGS = $(MODULE_LDFLAGS) \ -Wl,-framework -Wl,Cocoa -framework CoreAudio \ -Wl,-framework -Wl,AudioUnit -framework AudioUnit @@ -1618,7 +1618,7 @@ module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) # Bonjour -module_bonjour_publish_la_SOURCES = modules/module-bonjour-publish.c +module_bonjour_publish_la_SOURCES = modules/macosx/module-bonjour-publish.c module_bonjour_publish_la_LDFLAGS = $(MODULE_LDFLAGS) \ -Wl,-framework -Wl,CoreFoundation -framework CoreFoundation module_bonjour_publish_la_LIBADD = $(MODULE_LIBADD) -- cgit From 00d96c04dcf73fd1c79b2ac6956592e9ba17aebf Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Thu, 17 Mar 2011 12:40:26 +0100 Subject: osx: add -headerpad_max_install_names to LDFLAGS This is needed for sufficient padding of library names in linked binaries. --- src/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index ff98ddb1..dc49bc19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -78,6 +78,10 @@ AM_LDFLAGS+=-Wl,--export-all-symbols,--enable-auto-import -no-undefined WINSOCK_LIBS=-lwsock32 -lws2_32 -lwininet endif +if OS_IS_DARWIN +AM_LDFLAGS+=-headerpad_max_install_names +endif + FOREIGN_CFLAGS = -w MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED) MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la -- cgit