From 4acb42d2720b0530fff48ee99c46e6343aaf0803 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Wed, 19 Aug 2009 15:36:03 +0200
Subject: [PATCH] autotools fixes...

---
 src/lib/Makefile.am          | 9 ++++-----
 src/proc/Makefile.am         | 4 ++--
 tests/components/Makefile.am | 2 +-
 tests/lib/Makefile.am        | 1 +
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 76c72be62..f5ff19566 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -66,8 +66,7 @@ noinst_HEADERS +=						\
 	$(liblumiera_la_srcdir)/resourcecollector.h		\
 	$(liblumiera_la_srcdir)/ppmpl.h				\
 	$(liblumiera_la_srcdir)/allocationcluster.hpp		\
-	$(liblumiera_la_srcdir)/scopedholdertransfer.hpp	\
-	$(liblumiera_la_srcdir)/scopedholder.hpp		\
+	$(liblumiera_la_srcdir)/scoped-holder.hpp		\
 	$(liblumiera_la_srcdir)/lifecycleregistry.hpp		\
 	$(liblumiera_la_srcdir)/nobug-init.hpp			\
 	$(liblumiera_la_srcdir)/factory.hpp			\
@@ -77,8 +76,8 @@ noinst_HEADERS +=						\
 	$(liblumiera_la_srcdir)/singletonpreconfigure.hpp	\
 	$(liblumiera_la_srcdir)/lumitime.hpp			\
 	$(liblumiera_la_srcdir)/visitor.hpp			\
-	$(liblumiera_la_srcdir)/visitordispatcher.hpp		\
-	$(liblumiera_la_srcdir)/visitorpolicies.hpp		\
+	$(liblumiera_la_srcdir)/visitor-dispatcher.hpp		\
+	$(liblumiera_la_srcdir)/visitor-policies.hpp		\
 	$(liblumiera_la_srcdir)/sync.hpp			\
 	$(liblumiera_la_srcdir)/p.hpp				\
 	$(liblumiera_la_srcdir)/query.hpp			\
@@ -87,7 +86,7 @@ noinst_HEADERS +=						\
 	$(liblumiera_la_srcdir)/meta/typelist.hpp		\
 	$(liblumiera_la_srcdir)/meta/configflags.hpp		\
 	$(liblumiera_la_srcdir)/meta/generator.hpp		\
-	$(liblumiera_la_srcdir)/meta/typelistutil.hpp		\
+	$(liblumiera_la_srcdir)/meta/typelist-util.hpp		\
 	$(liblumiera_la_srcdir)/util.hpp			\
 	$(liblumiera_la_srcdir)/observable-list.hpp		\
 	$(liblumiera_la_srcdir)/sync.hpp			\
diff --git a/src/proc/Makefile.am b/src/proc/Makefile.am
index 8480e0703..d9988c42f 100644
--- a/src/proc/Makefile.am
+++ b/src/proc/Makefile.am
@@ -121,6 +121,7 @@ liblumiproccontrol_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
 
 liblumiproccontrol_la_SOURCES =					\
 	$(liblumiproccontrol_la_srcdir)/command.cpp		\
+	$(liblumiproccontrol_la_srcdir)/command-impl.cpp	\
 	$(liblumiproccontrol_la_srcdir)/handling-pattern.cpp	\
 	$(liblumiproccontrol_la_srcdir)/proc-dispatcher.cpp	\
 	$(liblumiproccontrol_la_srcdir)/pathmanager.cpp		\
@@ -149,7 +150,7 @@ liblumiprocmobjectsession_la_SOURCES =					\
 	$(liblumiprocmobjectsession_la_srcdir)/abstractmo.cpp		\
 	$(liblumiprocmobjectsession_la_srcdir)/allocation.cpp		\
 	$(liblumiprocmobjectsession_la_srcdir)/auto.cpp			\
-	$(liblumiprocmobjectsession_la_srcdir)/bindingl.cpp		\
+	$(liblumiprocmobjectsession_la_srcdir)/binding.cpp		\
 	$(liblumiprocmobjectsession_la_srcdir)/clip.cpp			\
 	$(liblumiprocmobjectsession_la_srcdir)/compoundclip.cpp		\
 	$(liblumiprocmobjectsession_la_srcdir)/constraint.cpp		\
@@ -237,7 +238,6 @@ noinst_HEADERS +=							\
 	$(liblumiproc_la_srcdir)/mobject/session/fixture.hpp		\
 	$(liblumiproc_la_srcdir)/mobject/session/locatingpin.hpp	\
 	$(liblumiproc_la_srcdir)/mobject/session/plug.hpp		\
-	$(liblumiproc_la_srcdir)/mobject/session/sessionimpl.hpp	\
 	$(liblumiproc_la_srcdir)/mobject/session/defsregistry.hpp	\
 	$(liblumiproc_la_srcdir)/mobject/explicitplacement.hpp		\
 	$(liblumiproc_la_srcdir)/mobject/mobject.hpp			\
diff --git a/tests/components/Makefile.am b/tests/components/Makefile.am
index 65f3ce2c9..560e8b1f5 100644
--- a/tests/components/Makefile.am
+++ b/tests/components/Makefile.am
@@ -80,7 +80,7 @@ test_components_SOURCES =							\
 noinst_HEADERS +=							\
 	$(testcomponents_srcdir)/backend/mediaaccessmock.hpp		\
 	$(testcomponents_srcdir)/proc/asset/testclipasset.hpp		\
-	$(testcomponents_srcdir)/proc/asset/assetdiagnostics.hpp	\
+	$(testcomponents_srcdir)/proc/asset/asset-diagnostics.hpp	\
 	$(testcomponents_srcdir)/proc/asset/testasset.hpp		\
 	$(testcomponents_srcdir)/proc/mobject/session/testclip.hpp	\
 	$(testcomponents_srcdir)/proc/mobject/session/testsession1.hpp
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index ab9a73ecf..8b24e0266 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -76,6 +76,7 @@ test_lib_SOURCES =						\
 	$(testlib_srcdir)/sync-classlock-test.cpp		\
 	$(testlib_srcdir)/sync-locking-test.cpp			\
 	$(testlib_srcdir)/sync-waiting-test.cpp			\
+	$(testlib_srcdir)/timewrappertest.cpp			\
 	$(testlib_srcdir)/thread-wrapper-test.cpp		\
 	$(testlib_srcdir)/thread-wrapper-join-test.cpp		\
 	$(testlib_srcdir)/test/cmdlinewrappertest.cpp		\