--- linuxsampler/trunk/src/Makefile.in	2004/06/14 19:33:16	123
+++ linuxsampler/trunk/src/Makefile.in	2004/07/13 22:17:10	202
@@ -108,12 +108,12 @@
 
 AM_CXXFLAGS = -ffast-math -march=$(target_cpu) -mcpu=$(target_cpu)
 
-SUBDIRS = network engines common audiodriver mididriver lib testcases drivers
+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/drivers/liblinuxsamplerdrivers.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/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 = -module
 
 bin_PROGRAMS = linuxsampler
 linuxsampler_SOURCES = linuxsampler.cpp
@@ -126,13 +126,13 @@
 
 liblinuxsampler_la_DEPENDENCIES = \
 	$(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/drivers/liblinuxsamplerdrivers.la \
-	$(top_builddir)/src/common/liblinuxsamplercommon.la \
-	$(top_builddir)/src/audiodriver/liblinuxsampleraudiodriver.la
+	$(top_builddir)/src/drivers/audio/liblinuxsampleraudiodriver.la \
+	$(top_builddir)/src/drivers/midi/liblinuxsamplermididriver.la \
+	$(top_builddir)/src/common/liblinuxsamplercommon.la
 am_liblinuxsampler_la_OBJECTS = Sampler.lo
 liblinuxsampler_la_OBJECTS = $(am_liblinuxsampler_la_OBJECTS)
 bin_PROGRAMS = linuxsampler$(EXEEXT)