From 5c454df9d9459cff349be064ab36432e008856d6 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Wed, 17 Dec 2008 17:57:45 +0100
Subject: [PATCH] Build 'lumiera' without liblumieracore

---
 src/lumiera/Makefile.am | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/lumiera/Makefile.am b/src/lumiera/Makefile.am
index 419462631..de9799808 100644
--- a/src/lumiera/Makefile.am
+++ b/src/lumiera/Makefile.am
@@ -17,31 +17,22 @@
 
 lumiera_srcdir = $(top_srcdir)/src/lumiera
 
+bin_PROGRAMS += lumiera
+lumiera_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
+lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
+lumiera_LDADD = liblumierabackend.la liblumieraproc.la liblumiera.la \
+		$(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
 
-noinst_LIBRARIES += liblumieracore.a
-liblumieracore_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
-liblumieracore_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
-
-liblumieracore_a_SOURCES =			\
+lumiera_SOURCES =				\
 	$(lumiera_srcdir)/guifacade.cpp		\
 	$(lumiera_srcdir)/configfacade.cpp	\
 	$(lumiera_srcdir)/appstate.cpp		\
 	$(lumiera_srcdir)/option.cpp		\
 	$(lumiera_srcdir)/subsys.cpp		\
 	$(lumiera_srcdir)/interfaceproxy.cpp	\
-	$(lumiera_srcdir)/nobugcfg.cpp
-
-
-
-bin_PROGRAMS += lumiera
-lumiera_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
-lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
-lumiera_LDADD = liblumieracore.a liblumibackend.a liblumiproc.a liblumiera.a liblumicommon.a \
-		$(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
-
-lumiera_SOURCES =				\
-	$(top_srcdir)/src/guistart.cpp		\
-	$(top_srcdir)/src/main.cpp
+	$(lumiera_srcdir)/nobugcfg.cpp		\
+	$(lumiera_srcdir)/guistart.cpp		\
+	$(lumiera_srcdir)/main.cpp
 
 
 noinst_HEADERS +=				\