--- linuxsampler/trunk/src/common/Makefile.am	2004/10/08 20:51:39	271
+++ linuxsampler/trunk/src/common/Makefile.am	2007/09/04 18:02:27	1324
@@ -1,7 +1,40 @@
 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 \
+	Thread.h \
+	global.h \
+	optional.h \
+	Mutex.h \
+	SynchronizedConfig.h \
+	Condition.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 RTELMemoryPool.h RTMath.cpp RTMath.h Thread.cpp Thread.h optional.h optional.cpp stacktrace.c stacktrace.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
+
+# create the plugins directory (i.e. /usr/lib/linuxsampler/plugins)
+install-exec-hook:
+	mkdir -p $(DESTDIR)$(config_plugin_dir)
+
+# remove the plugins directory (if empty)
+uninstall-hook:
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(config_plugin_dir)