2011/3/21 Daniel Mack <daniel at zonque.org>: > On Sun, Mar 20, 2011 at 7:14 PM, Tanu Kaskinen <tanuk at iki.fi> wrote: >> On Sun, 2011-03-20 at 18:39 +0100, Daniel Mack wrote: >>> This is needed for sufficient padding of library names in linked >>> binaries. >>> --- >>> ?src/Makefile.am | ? ?5 +++++ >>> ?1 files changed, 5 insertions(+), 0 deletions(-) >>> >>> diff --git a/src/Makefile.am b/src/Makefile.am >>> index ff98ddb..c182483 100644 >>> --- a/src/Makefile.am >>> +++ b/src/Makefile.am >>> @@ -82,6 +82,11 @@ FOREIGN_CFLAGS = -w >>> ?MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED) >>> ?MODULE_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la >>> >>> +if OS_IS_DARWIN >>> +AM_LDFLAGS+=-headerpad_max_install_names >>> +MODULE_LDFLAGS+=-headerpad_max_install_names >>> +endif >> >> If you put this block before MODULE_LDFLAGS is defined, then you don't >> need to touch MODULE_LDFLAGS, because they include AM_LDFLAGS >> automatically. > > Yes, of course. I'll fix this. Just to reiterate: You don't have to do this. Only appending to AM_LDFLAGS (no need to move) adds it to both. So just drop the MODULE_LDFLAGS+= line of that hunk. You can verify by running a build with make V=1, you'll see that it all just works. >> Cosmetic: spaces around "+=" would be nice (it seems that it wasn't >> entirely consistent before either...) > > I'd rather keep it in sync with the other lines. Someone could come up > with a patch to fix them all :) Which other lines? It seems that the only lines in the whole file that don't use spaces are in the if OS_IS_WIN32 block (so probably my bad) With spaces clearly is preferred, so please use that. > Daniel Maarten
