Refactor Makefiles to exclude GTK on demand.

1 files changed, 39 insertions, 21 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 321b472..55a8f05 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,9 @@ lib_LTLIBRARIES = libchrysacore.la
 bin_PROGRAMS = chrysalide chrysalide-hub
 
 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/intl
+
+
 
 ############################################################
 # Bibliothèque dynamique
@@ -17,27 +20,45 @@ GOBJECT_LEAKS_SOURCES = gleak.h gleak.c
 
 endif
 
-libchrysacore_la_SOURCES = 				\
+
+if BUILD_GTK_SUPPORT
+
+	GTKEXT_LIBADD =							\
+		gtkext/libgtkext.la
+
+	GTKEXT_SUBDIR = 						\
+		gtkext
+
+	GUI_LIBADD =							\
+		gui/libgui.la
+
+	GUI_SUBDIR =							\
+		gui
+
+endif
+
+
+libchrysacore_la_SOURCES = 					\
 	$(GOBJECT_LEAKS_SOURCES)
 
 # -ldl: dladdr(), dlerror()
 libchrysacore_la_LDFLAGS =					\
 	-avoid-version -ldl						\
-	$(LIBGTK_LIBS) $(LIBXML_LIBS)			\
+	$(TOOLKIT_LIBS) $(LIBXML_LIBS)			\
 	$(LIBSQLITE_LIBS) $(LIBARCHIVE_LIBS)	\
 	$(LIBCURL_LIBS)
 
-libchrysacore_la_LIBADD =				\
-	analysis/libanalysis.la				\
-	arch/libarch.la						\
-	common/libcommon.la					\
-	core/libcore.la						\
-	debug/libdebug.la					\
-	format/libformat.la					\
-	glibext/libglibext.la				\
-	gtkext/libgtkext.la					\
-	gui/libgui.la						\
-	mangling/libmangling.la				\
+libchrysacore_la_LIBADD =					\
+	analysis/libanalysis.la					\
+	arch/libarch.la							\
+	common/libcommon.la						\
+	core/libcore.la							\
+	debug/libdebug.la						\
+	format/libformat.la						\
+	glibext/libglibext.la					\
+	$(GTKEXT_LIBADD)						\
+	$(GUI_LIBADD)							\
+	mangling/libmangling.la					\
 	plugins/libplugins.la
 
 
@@ -52,15 +73,11 @@ chrysalide_SOURCES = 					\
 	main.c
 
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/intl $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) `pkg-config --cflags gthread-2.0` $(LIBPYTHON_CFLAGS)
+chrysalide_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS)
 
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
-chrysalide_LDFLAGS = $(LIBGTK_LIBS) -L/usr/X11R6/lib -ldl -lm $(LIBXML_LIBS) `pkg-config --libs gthread-2.0` $(LIBPYTHON_LIBS) $(LIBARCHIVE_LIBS) $(LIBSQLITE_LIBS) \
+chrysalide_LDFLAGS = $(TOOLKIT_LIBS) -L/usr/X11R6/lib -ldl -lm $(LIBXML_LIBS) $(LIBPYTHON_LIBS) $(LIBARCHIVE_LIBS) $(LIBSQLITE_LIBS) \
 	-L.libs -lchrysacore
 
-
 chrysalide_LDADD = $(LIBINTL)
 
 
@@ -74,8 +91,9 @@ EXTRA_chrysalide_hub_DEPENDENCIES = $(lib_LTLIBRARIES)
 chrysalide_hub_SOURCES =				\
 	hub.c
 
+chrysalide_hub_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS)
 
-chrysalide_hub_LDFLAGS = $(LIBGTK_LIBS) -L.libs -lchrysacore
+chrysalide_hub_LDFLAGS = $(TOOLKIT_LIBS) $(LIBXML_LIBS) -L.libs -lchrysacore
 
 
 
@@ -85,4 +103,4 @@ chrysalide_hub_LDFLAGS = $(LIBGTK_LIBS) -L.libs -lchrysacore
 
 # glibext doit être traité en premier, à cause des marshals GLib
 
-SUBDIRS = core glibext gtkext analysis arch format common debug gui mangling plugins
+SUBDIRS = core glibext $(GTKEXT_SUBDIR) analysis arch format common debug $(GUI_SUBDIR) mangling plugins