diff -uNr jack-audio-connection-kit-0.121.2.orig//jackd/Makefile.am jack-audio-connection-kit-0.121.2/jackd/Makefile.am --- jack-audio-connection-kit-0.121.2.orig//jackd/Makefile.am 2011-08-07 15:41:35.926000123 +0200 +++ jack-audio-connection-kit-0.121.2/jackd/Makefile.am 2011-08-07 15:44:23.812000122 +0200 @@ -41,6 +41,7 @@ jackstart_LDFLAGS = -lcap lib_LTLIBRARIES = libjackserver.la +noinst_LTLIBRARIES = libsimd.la libjackserver_la_CFLAGS = $(AM_CFLAGS) @@ -51,11 +52,13 @@ ../libjack/midiport.c ../libjack/ringbuffer.c ../libjack/shm.c \ ../libjack/thread.c ../libjack/time.c ../libjack/transclient.c \ ../libjack/unlock.c -libjackserver_la_LIBADD = simd.lo @OS_LDFLAGS@ $(top_builddir)/libjack/libjack.la +libjackserver_la_LIBADD = libsimd.la @OS_LDFLAGS@ $(top_builddir)/libjack/libjack.la libjackserver_la_LDFLAGS = -export-dynamic -version-info @JACK_SO_VERSION@ -simd.lo: $(srcdir)/../libjack/simd.c - $(LIBTOOL) --mode=compile $(CC) -I$(top_builddir) $(JACK_CORE_CFLAGS) $(SIMD_CFLAGS) -c -o simd.lo $(srcdir)/../libjack/simd.c +libsimd_la_SOURCES = ../libjack/simd.c +# Avoid including JAC_OPT_CLFAGS (included in JACK_CFLAGS) in simd.c's +# CFLAGS. +libsimd_la_CFLAGS = $(JACK_CORE_CFLAGS) $(SIMD_CFLAGS) man_MANS = jackd.1 jackstart.1 EXTRA_DIST = $(man_MANS) diff -uNr jack-audio-connection-kit-0.121.2.orig//libjack/Makefile.am jack-audio-connection-kit-0.121.2/libjack/Makefile.am --- jack-audio-connection-kit-0.121.2.orig//libjack/Makefile.am 2011-08-07 15:41:35.946000123 +0200 +++ jack-audio-connection-kit-0.121.2/libjack/Makefile.am 2011-08-07 15:43:32.099000122 +0200 @@ -24,19 +24,21 @@ transclient.c \ unlock.c -simd.lo: $(srcdir)/simd.c - $(LIBTOOL) --mode=compile $(CC) -I$(top_builddir) $(JACK_CORE_CFLAGS) $(SIMD_CFLAGS) -c -o simd.lo $(srcdir)/simd.c - lib_LTLIBRARIES = libjack.la +noinst_LTLIBRARIES = libsimd.la noinst_HEADERS = local.h AM_CFLAGS = $(JACK_CFLAGS) -DJACK_LOCATION=\"$(bindir)\" AM_CXXFLAGS = $(JACK_CFLAGS) +libsimd_la_SOURCES = simd.c +# Avoid having JACK_OPT_FLAGS (which is included in JACK_CFLAGS) in +# simd.c's CFLAGS: +libsimd_la_CFLAGS = $(JACK_CORE_CFLAGS) $(SIMD_CFLAGS) + libjack_la_CFLAGS = $(AM_CFLAGS) libjack_la_SOURCES = $(SOURCE_FILES) -libjack_la_LIBADD = simd.lo @OS_LDFLAGS@ +libjack_la_LIBADD = libsimd.la $(OS_LDFLAGS) libjack_la_LDFLAGS = -export-dynamic -version-info @JACK_SO_VERSION@ -