--- linuxsampler/trunk/src/engines/common/Makefile.am	2004/12/13 00:46:42	319
+++ linuxsampler/trunk/src/engines/common/Makefile.am	2009/10/23 17:53:17	2012
@@ -1,9 +1,20 @@
-INCLUDES = $(all_includes)
+INCLUDES = $(all_includes) $(SNDFILE_CFLAGS)
 METASOURCES = AUTO
 
-AM_CXXFLAGS = -ffast-math -march=$(target_cpu) -mcpu=$(target_cpu) -fpermissive
+AM_CXXFLAGS = -Wreturn-type -ffast-math $(CXX_CPU_SWITCH)
 
-noinst_LTLIBRARIES =  liblinuxsamplercommonengine.la
-liblinuxsamplercommonengine_la_SOURCES =  BiquadFilter.h Engine.h Event.cpp Event.h LFO.h
-
-noinst_HEADERS =  Resampler.h
+noinst_LTLIBRARIES = liblinuxsamplercommonengine.la
+liblinuxsamplercommonengine_la_SOURCES = \
+	BiquadFilter.h \
+	Event.cpp Event.h \
+	Sample.h SampleManager.h SampleFile.cpp SampleFile.h \
+	Stream.h StreamBase.cpp StreamBase.h \
+	DiskThreadBase.cpp DiskThreadBase.h \
+	Voice.h VoiceBase.h MidiKeyboardManager.h \
+	LFOBase.h \
+	LFOTriangleDiHarmonic.h \
+	LFOTriangleIntAbsMath.h \
+	LFOTriangleIntMath.h \
+	Resampler.h
+liblinuxsamplercommonengine_la_LIBADD = $(SNDFILE_LIBS)
+liblinuxsamplercommonengine_la_LDFLAGS = $(SNDFILE_CFLAGS)