From 32a8dcd6ae986e9974236f6a8f128baa5d7310f4 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Thu, 18 Dec 2008 20:26:46 +0100
Subject: [PATCH] Reorganized the gui/Makefile.am (broken)

 * still building lumigui for now
 * base for building gtkgui.lum the final gui module
 * build libgui.la as convenience library holding all gui code

Does not build on non gnome systems because pita dependencies of libgdl
---
 src/gui/Makefile.am | 107 +++++++++++++++++++++++++++++++-------------
 1 file changed, 75 insertions(+), 32 deletions(-)

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 9532ab408..969b61ac8 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -16,29 +16,75 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 lumigui_srcdir = $(top_srcdir)/src/gui
-lib_LTLIBRARIES += libgui.la
+
+#
+# lumigui is the standalone gui mockup, will be removed later
+#
 bin_PROGRAMS += lumigui
 
-#lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
+lumigui_CPPFLAGS = $(AM_CPPFLAGS)					\
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\"				\
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\"				\
+	$(LUMIERA_GUI_CFLAGS)
 
-lumigui_CPPFLAGS = $(AM_CPPFLAGS)                   \
-    -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
-    -DPACKAGE_SRC_DIR=\""$(srcdir)"\"               \
-    -DPACKAGE_DATA_DIR=\""$(datadir)"\"             \
-    $(LUMIERA_GUI_CFLAGS)
-    
-libgui_la_CPPFLAGS = $(AM_CPPFLAGS)                   \
-    -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
-    -DPACKAGE_SRC_DIR=\""$(srcdir)"\"               \
-    -DPACKAGE_DATA_DIR=\""$(datadir)"\"             \
-    $(LUMIERA_GUI_CFLAGS)
+lumigui_LDADD =					\
+	-L$(top_buiddir)			\
+	liblumieracommon.la			\
+	liblumierabackend.la			\
+	liblumieraproc.la			\
+	liblumiera.la				\
+	libgui.la				\
+	$(LUMIERA_GUI_LIBS)			\
+	$(NOBUGMT_LUMIERA_LIBS)			\
+	-lboost_program_options-mt		\
+	-lboost_regex-mt
 
-lumigui_SOURCES =								\
-	$(lumigui_srcdir)/gtk-lumiera.cpp					\
-	$(lumigui_srcdir)/gtk-lumiera.hpp					
-	
-libgui_la_SOURCES =	                           \
-    $(lumigui_srcdir)/guistart.cpp             \
+lumigui_SOURCES =				\
+	$(lumigui_srcdir)/gtk-lumiera.cpp	\
+	$(lumigui_srcdir)/gtk-lumiera.hpp
+
+lumigui_DEPENDENCIES =				\
+	$(top_builddir)/lumiera_ui.rc		\
+	$(top_builddir)/liblumieracommon.la	\
+	$(top_builddir)/liblumiera.la		\
+	$(top_builddir)/liblumierabackend.la	\
+	$(top_builddir)/liblumieraproc.la
+
+#
+# gtkgui.lum becomes the pluginized gu
+#
+
+pkglib_LTLIBRARIES += gtkgui.la
+
+gtkgui_la_CPPFLAGS = $(AM_CPPFLAGS) -Wall -Werror -DLUMIERA_PLUGIN -I$(top_srcdir)/src/
+gtkgui_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/null -shrext .lum
+
+gtkgui_la_LIBADD =		\
+	liblumieracommon.la	\
+	liblumierabackend.la	\
+	liblumieraproc.la	\
+	liblumiera.la		\
+	$(LUMIERA_GUI_LIBS)	\
+	$(NOBUGMT_LUMIERA_LIBS)
+
+gtkgui_la_SOURCES =			\
+	$(lumigui_srcdir)/guistart.cpp
+
+
+#
+# libgui is a convinience library used by lumigui and the gtkgui module
+#
+noinst_LTLIBRARIES += libgui.la
+
+libgui_la_CPPFLAGS = $(AM_CPPFLAGS)					\
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\"				\
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\"				\
+	$(LUMIERA_GUI_CFLAGS)
+
+
+libgui_la_SOURCES =								\
 	$(lumigui_srcdir)/guinotificationfacade.cpp				\
 	$(lumigui_srcdir)/window-manager.cpp					\
 	$(lumigui_srcdir)/window-manager.hpp					\
@@ -108,22 +154,19 @@ libgui_la_SOURCES =	                           \
 	$(lumigui_srcdir)/output/xvdisplayer.cpp				\
 	$(lumigui_srcdir)/output/xvdisplayer.hpp
 
-lumigui_LDFLAGS =
-# $(LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
 
-libgui_la_LIBADD = liblumieracommon.la liblumierabackend.la liblumieraproc.la liblumiera.la \
-                $(LUMIERA_GUI_LIBS) $(NOBUGMT_LUMIERA_LIBS)
-lumigui_LDADD = liblumieracommon.la liblumierabackend.la liblumieraproc.la liblumiera.la libgui.la \
-                $(LUMIERA_GUI_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
+libgui_la_LIBADD =		\
+	liblumieracommon.la	\
+	liblumierabackend.la	\
+	liblumieraproc.la	\
+	liblumiera.la		\
+	$(LUMIERA_GUI_LIBS)	\
+	$(NOBUGMT_LUMIERA_LIBS)
 
-lumigui_DEPENDENCIES =				\
-	$(top_builddir)/lumiera_ui.rc		\
-	$(top_builddir)/liblumieracommon.la  \
-	$(top_builddir)/liblumiera.la        \
-	$(top_builddir)/liblumierabackend.la \
-	$(top_builddir)/liblumieraproc.la    
-	
 
+#
+# themes, locales and other supplemental data
+#
 $(top_builddir)/lumiera_ui.rc:
 	cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)