--- linuxsampler/trunk/src/Makefile.am	2004/04/26 17:15:51	53
+++ linuxsampler/trunk/src/Makefile.am	2004/05/02 17:45:43	57
@@ -4,17 +4,13 @@
 # to prevent compile errors on some systems
 AM_CXXFLAGS = -pedantic
 
-SUBDIRS = network engines common audiodriver mididriver lib
+SUBDIRS = network engines common audiodriver mididriver lib testcases
 
 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
 
 bin_PROGRAMS = linuxsampler
 linuxsampler_SOURCES = linuxsampler.cpp
-linuxsampler_LDADD = $(top_builddir)/src/liblinuxsampler.la $(top_builddir)/src/common/liblinuxsamplercommon.a $(top_builddir)/src/mididriver/liblinuxsamplermididriver.a $(top_builddir)/src/audiodriver/liblinuxsampleraudiodriver.a $(top_builddir)/src/engines/common/liblinuxsamplercommonengine.a $(top_builddir)/src/engines/gig/liblinuxsamplergigengine.a $(top_builddir)/src/network/liblinuxsamplernetwork.a $(top_builddir)/src/lib/fileloader/libgig/libgig.la -lasound
-linuxsampler_DEPENDENCIES = $(JACK_LIBS)
-liblinuxsampler_la_LIBADD = $(top_builddir)/src/network/liblinuxsamplernetwork.a $(top_builddir)/src/mididriver/liblinuxsamplermididriver.a $(top_builddir)/src/lib/fileloader/libgig/libgig.la $(top_builddir)/src/engines/gig/liblinuxsamplergigengine.a $(top_builddir)/src/engines/common/liblinuxsamplercommonengine.a $(top_builddir)/src/common/liblinuxsamplercommon.a $(top_builddir)/src/audiodriver/liblinuxsampleraudiodriver.a -lasound
-liblinuxsampler_la_DEPENDENCIES = $(JACK_LIBS)
-liblinuxsampler_la_LDFLAGS = $(JACK_LIBS)
+linuxsampler_LDADD = $(top_builddir)/src/liblinuxsampler.la