--- linuxsampler/trunk/src/Makefile.am	2004/01/18 20:31:31	31
+++ linuxsampler/trunk/src/Makefile.am	2005/05/04 12:02:35	510
@@ -1,15 +1,22 @@
-bin_PROGRAMS = linuxsampler
-linuxsampler_SOURCES = linuxsampler.cpp audioio.cpp audioio.h audiothread.cpp audiothread.h diskthread.cpp diskthread.h global.cpp global.h midiin.cpp midiin.h ringbuffer.h stream.cpp stream.h thread.cpp thread.h voice.cpp voice.h rtelmemorypool.h atomic.h modulationsystem.cpp eg_vca.cpp alsaio.cpp alsaio.h jackio.cpp jackio.h
-
 # set the include path found by configure
 INCLUDES= $(all_includes)
 
-# to prevent compile errors on some systems
-AM_CXXFLAGS = -pedantic
+AM_CXXFLAGS = -Wreturn-type -ffast-math $(CXX_CPU_SWITCH)
+
+SUBDIRS = network engines common lib testcases drivers
 
-# the library search path.
-linuxsampler_LDFLAGS = $(all_libraries) $(JACK_LIBS)
-lib_LIBRARIES =  libgig.a
-libgig_a_SOURCES =  DLS.cpp DLS.h gig.cpp gig.h RIFF.cpp RIFF.h
-linuxsampler_LDADD = $(top_builddir)/src/libgig.a -lpthread -lasound
-noinst_HEADERS = modulationsystem.h eg_vca.h
+pkglib_LTLIBRARIES = liblinuxsampler.la
+liblinuxsampler_la_SOURCES = Sampler.cpp Sampler.h
+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
+
+bin_PROGRAMS = linuxsampler
+linuxsampler_SOURCES = linuxsampler.cpp
+linuxsampler_LDADD = $(top_builddir)/src/liblinuxsampler.la