--- linuxsampler/trunk/src/Makefile.am	2004/05/02 17:45:43	57
+++ linuxsampler/trunk/src/Makefile.am	2005/04/10 11:55:44	497
@@ -1,15 +1,18 @@
 # set the include path found by configure
 INCLUDES= $(all_includes)
 
-# to prevent compile errors on some systems
-AM_CXXFLAGS = -pedantic
+AM_CXXFLAGS = -ffast-math -march=$(target_cpu)
 
-SUBDIRS = network engines common audiodriver mididriver lib testcases
+SUBDIRS = network engines common lib testcases drivers
 
 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_LIBADD = \
+	$(top_builddir)/src/network/liblinuxsamplernetwork.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/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
 
 bin_PROGRAMS = linuxsampler
 linuxsampler_SOURCES = linuxsampler.cpp