1 files changed, 55 insertions, 37 deletions

diff --git a/src/glibext/Makefile.am b/src/glibext/Makefile.am
index 3649d50..b0a7c31 100644
--- a/src/glibext/Makefile.am
+++ b/src/glibext/Makefile.am
@@ -1,48 +1,66 @@
 
 BUILT_SOURCES = chrysamarshal.h chrysamarshal.c resources.h resources.c
 
-noinst_LTLIBRARIES  = libglibext4.la libglibextui.la # libglibext.la
-
-libglibext_la_SOURCES =						\
-	comparison-int.h						\
-	comparison.h comparison.c				\
-	configuration-int.h						\
-	configuration.h configuration.c			\
-	gbinarycursor.h gbinarycursor.c			\
-	gbinportion-int.h						\
-	gbinportion.h gbinportion.c				\
-	glinecursor-int.h						\
-	glinecursor.h glinecursor.c				\
-	gnhash.h gnhash.c						\
-	notifier.h								\
-	objhole.h								\
-	proto.h									\
-	seq.h seq.c								\
-	_signal.h signal.c						\
-	singleton.h singleton.c					\
-	linetoken.h linetoken.c					\
-	umemslice-int.h							\
-	umemslice.h umemslice.c
-
-if BUILD_GTK_SUPPORT
-
-libglibext_la_SOURCES +=					\
-	gloadedpanel-int.h						\
-	gloadedpanel.h gloadedpanel.c			\
-	named-int.h								\
-	named.h named.c
-
-endif
-
-libglibext_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS)
+noinst_LTLIBRARIES  = libglibext.la libglibextui.la
+
+# libglibext_la_SOURCES =						\
+# 	configuration-int.h						\
+# 	configuration.h configuration.c			\
+# 	gbinarycursor.h gbinarycursor.c			\
+# 	glinecursor-int.h						\
+# 	glinecursor.h glinecursor.c				\
+# 	gnhash.h gnhash.c						\
+# 	notifier.h								\
+# 									\
+# 	proto.h									\
+# 	seq.h seq.c								\
+# 	singleton.h singleton.c					\
+# 	linetoken.h linetoken.c					\
+# 	umemslice-int.h							\
+# 	umemslice.h umemslice.c
+
+# if BUILD_GTK_SUPPORT
+
+# libglibext_la_SOURCES +=					\
+# 	gloadedpanel-int.h						\
+# 	gloadedpanel.h gloadedpanel.c			\
+# 	named-int.h								\
+# 	named.h named.c
+
+# endif
+
+# libglibext_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS)
 
 #libglibext_la_LIBADD = 					\
 #	generators/libglibextgenerators.la
 
 
-libglibext4_la_SOURCES =					\
+libglibext_la_SOURCES =						\
 	chrysamarshal.h chrysamarshal.c			\
+	comparable-int.h						\
+	comparable.h comparable.c				\
+	hashable-int.h							\
+	hashable.h hashable.c					\
 	helpers.h								\
+	log-int.h								\
+	log.h log.c								\
+	objhole-int.h							\
+	objhole.h objhole.c						\
+	portion-int.h							\
+	portion.h portion.c						\
+	secstorage-int.h						\
+	secstorage.h secstorage.c				\
+	serialize-int.h							\
+	serialize.h serialize.c					\
+	sigredir.h sigredir.c					\
+	singleton-int.h							\
+	singleton.h singleton.c					\
+	storage-int.h							\
+	storage.h storage.c						\
+	strbuilder-int.h						\
+	strbuilder.h strbuilder.c				\
+	tpmem-int.h								\
+	tpmem.h tpmem.c							\
 	work-int.h								\
 	work.h work.c							\
 	workgroup-int.h							\
@@ -50,7 +68,7 @@ libglibext4_la_SOURCES =					\
 	workqueue-int.h							\
 	workqueue.h workqueue.c
 
-libglibext4_la_CFLAGS = $(TOOLKIT_CFLAGS)
+libglibext_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBZIP_CFLAGS)
 
 
 RES_FILES =									\
@@ -84,7 +102,7 @@ libglibextui_la_LIBADD = 					\
 
 devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
-dev_HEADERS = $(libglibext_la_SOURCES:%c=)
+dev_HEADERS = $(libglibext_la_SOURCES:%c=) $(libglibextui_la_SOURCES:%c=)
 
 
 SUBDIRS = generators options