--- linuxsampler/trunk/src/Makefile.am	2006/06/28 19:32:21	885
+++ linuxsampler/trunk/src/Makefile.am	2007/05/29 23:59:36	1212
@@ -12,17 +12,15 @@
 
 AM_CXXFLAGS = -Wreturn-type -ffast-math $(CXX_CPU_SWITCH)
 
-SUBDIRS = network engines common lib testcases drivers
+SUBDIRS = db network engines common lib testcases drivers
 
 liblinuxsamplerincludedir = $(includedir)/linuxsampler
-liblinuxsamplerinclude_HEADERS = Sampler.h
-
-liblinuxsampler_configdir = $(libdir)/linuxsampler/include
-liblinuxsampler_config_DATA = ../config.h
+liblinuxsamplerinclude_HEADERS = Sampler.h EventListeners.h
 
 pkglib_LTLIBRARIES = liblinuxsampler.la
 liblinuxsampler_la_SOURCES = Sampler.cpp
 liblinuxsampler_la_LIBADD = \
+	$(top_builddir)/src/db/liblinuxsamplerdb.la \
 	$(top_builddir)/src/network/liblinuxsamplernetwork.la \
 	$(top_builddir)/src/engines/gig/liblinuxsamplergigengine.la \
 	$(top_builddir)/src/engines/common/liblinuxsamplercommonengine.la \
@@ -36,4 +34,4 @@
 bin_PROGRAMS = linuxsampler
 linuxsampler_SOURCES = linuxsampler.cpp
 linuxsampler_LDADD = $(top_builddir)/src/liblinuxsampler.la
-linuxsampler_LDFLAGS = $(coremidi_ldflags) 
+linuxsampler_LDFLAGS = $(coremidi_ldflags)