--- linuxsampler/trunk/src/common/Makefile.am	2005/02/26 01:23:55	410
+++ linuxsampler/trunk/src/common/Makefile.am	2007/05/24 14:04:18	1200
@@ -1,8 +1,30 @@
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-AM_CXXFLAGS = -ffast-math -march=$(target_cpu) -mcpu=$(target_cpu)
+AM_CXXFLAGS = -Wreturn-type -ffast-math $(CXX_CPU_SWITCH)
+
+liblinuxsamplercommonincludedir = $(includedir)/linuxsampler/common
+liblinuxsamplercommoninclude_HEADERS = \
+	atomic.h \
+	Exception.h \
+	global.h \
+	optional.h \
+	Mutex.h \
+	SynchronizedConfig.h
 
 noinst_LTLIBRARIES = liblinuxsamplercommon.la
-liblinuxsamplercommon_la_SOURCES = atomic.h Condition.cpp Condition.h ConditionServer.cpp ConditionServer.h global.h LinuxSamplerException.h Mutex.cpp Mutex.h ResourceManager.h RingBuffer.h RTMath.cpp RTMath.h Thread.cpp Thread.h optional.h optional.cpp stacktrace.c stacktrace.h Features.cpp
-noinst_HEADERS =  Features.h
+liblinuxsamplercommon_la_SOURCES = \
+	ArrayList.h \
+	Condition.cpp Condition.h \
+	ConditionServer.cpp ConditionServer.h \
+	Features.cpp Features.h \
+	global.cpp \
+	Mutex.cpp \
+	optional.cpp \
+	Pool.h \
+	ResourceManager.h \
+	RingBuffer.h \
+	RTMath.cpp RTMath.h \
+	stacktrace.c stacktrace.h \
+	Thread.cpp Thread.h \
+	WorkerThread.cpp WorkerThread.h