--- linuxsampler/trunk/src/Makefile.am	2004/05/23 19:16:33	80
+++ linuxsampler/trunk/src/Makefile.am	2005/12/22 19:38:53	820
@@ -1,15 +1,36 @@
 # set the include path found by configure
 INCLUDES= $(all_includes)
 
-AM_CXXFLAGS = -ffast-math -march=$(target_cpu) -mcpu=$(target_cpu)
+if HAVE_COREMIDI
+coremidi_ldflags = -framework CoreAudio \
+	-framework CoreMIDI \
+	-framework CoreServices \
+	-framework AudioUnit
+else
+coremidi_ldflags =
+endif
 
-SUBDIRS = network engines common audiodriver mididriver lib testcases
+AM_CXXFLAGS = -Wreturn-type -ffast-math $(CXX_CPU_SWITCH)
+
+SUBDIRS = network engines common lib testcases drivers
+
+liblinuxsamplerincludedir = $(includedir)
+liblinuxsamplerinclude_HEADERS = Sampler.h
 
 pkglib_LTLIBRARIES = liblinuxsampler.la
-liblinuxsampler_la_SOURCES = Sampler.cpp Sampler.h
-liblinuxsampler_la_LIBADD = $(top_builddir)/src/network/liblinuxsamplernetwork.la $(top_builddir)/src/mididriver/liblinuxsamplermididriver.la $(top_builddir)/src/lib/fileloader/libgig/libgig.la $(top_builddir)/src/engines/gig/liblinuxsamplergigengine.la $(top_builddir)/src/engines/common/liblinuxsamplercommonengine.la $(top_builddir)/src/common/liblinuxsamplercommon.la $(top_builddir)/src/audiodriver/liblinuxsampleraudiodriver.la
-liblinuxsampler_la_LDFLAGS = -module
+liblinuxsampler_la_SOURCES = Sampler.cpp
+liblinuxsampler_la_LIBADD = \
+	$(top_builddir)/src/network/liblinuxsamplernetwork.la \
+	$(top_builddir)/src/engines/gig/liblinuxsamplergigengine.la \
+	$(top_builddir)/src/engines/common/liblinuxsamplercommonengine.la \
+	$(top_builddir)/src/engines/liblinuxsamplerengines.la \
+	$(top_builddir)/src/drivers/liblinuxsamplerdrivers.la \
+	$(top_builddir)/src/drivers/audio/liblinuxsampleraudiodriver.la \
+	$(top_builddir)/src/drivers/midi/liblinuxsamplermididriver.la \
+	$(top_builddir)/src/common/liblinuxsamplercommon.la
+liblinuxsampler_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
 
 bin_PROGRAMS = linuxsampler
 linuxsampler_SOURCES = linuxsampler.cpp
 linuxsampler_LDADD = $(top_builddir)/src/liblinuxsampler.la
+linuxsampler_LDFLAGS = $(coremidi_ldflags)