--- linuxsampler/trunk/src/Makefile.am	2003/11/05 14:47:10	9
+++ linuxsampler/trunk/src/Makefile.am	2005/07/19 15:43:40	697
@@ -1,14 +1,26 @@
-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
-
 # 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) 
-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
+liblinuxsamplerincludedir = $(includedir)
+liblinuxsamplerinclude_HEADERS = Sampler.h
+
+pkglib_LTLIBRARIES = liblinuxsampler.la
+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