Prepare the update of the widget providing a hex view.

5 files changed, 33 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index 790ff74..a0d1e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,6 +420,9 @@ if test "x$enable_gtk_support" = "xyes"; then
     AC_SUBST(TOOLKIT4_CFLAGS)
     AC_SUBST(TOOLKIT4_LIBS)
 
+    AC_SUBST(LIBGTK4_CFLAGS)
+    AC_SUBST(LIBGTK4_LIBS)
+
 else
 
     TOOLKIT_CFLAGS="$LIBGOBJ_CFLAGS $LIBGTHREAD_CFLAGS $LIBGMOD_CFLAGS"
diff --git a/src/Makefile.am b/src/Makefile.am
index a1912b0..89721b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 
-lib_LTLIBRARIES = libchrysacore.la
+lib_LTLIBRARIES = libchrysacoreui.la # libchrysacore.la
 
-bin_PROGRAMS = chrysalide chrysalide-hub rost framework
+bin_PROGRAMS = framework # chrysalide chrysalide-hub rost
 
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/intl
@@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/intl
 
 
 ############################################################
-# Bibliothèque dynamique
+# Bibliothèques dynamiques
 ############################################################
 
 #--- libchrysacore
@@ -74,6 +74,21 @@ libchrysacore_la_LDFLAGS += $(LIBMAGIC_LIBS)
 endif
 
 
+#--- libchrysacoreui
+
+if BUILD_GTK_SUPPORT
+
+libchrysacoreui_la_SOURCES =
+
+libchrysacoreui_la_LIBADD =					\
+	gtkext/libgtkext4.la
+
+libchrysacoreui_la_LDFLAGS =				\
+	$(LIBGTK4_CFLAGS)
+
+endif
+
+
 
 ############################################################
 # Programme principal
@@ -95,13 +110,15 @@ chrysalide_LDADD = $(LIBINTL)
 
 
 
+EXTRA_framework_DEPENDENCIES = libchrysacoreui.la
+
 framework_SOURCES = 						\
 	framework.h framework.c
 
-
 framework_CFLAGS = $(TOOLKIT4_CFLAGS)
 
-framework_LDFLAGS = $(TOOLKIT4_LIBS)
+framework_LDFLAGS = $(TOOLKIT4_LIBS) \
+	-L.libs -lchrysacoreui
 
 framework_LDADD =
 
diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am
index 5bfc55f..a037fb8 100644
--- a/src/gtkext/Makefile.am
+++ b/src/gtkext/Makefile.am
@@ -1,7 +1,7 @@
 
 BUILT_SOURCES = resources.h resources.c
 
-noinst_LTLIBRARIES = libgtkext.la
+noinst_LTLIBRARIES = libgtkext4.la # libgtkext.la
 
 UI_FILES =								\
 	blockbar.ui
@@ -29,12 +29,18 @@ libgtkext_la_SOURCES =						\
 	tiledgrid.h tiledgrid.c					\
 	tmgt.h tmgt.c
 
-libgtkext_la_LIBADD = 					\
+libgtkext_la_LIBADD = 						\
 	graph/libgtkextgraph.la
 
 libgtkext_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 
 
+libgtkext4_la_SOURCES =						\
+	hexview.h hexview.c
+
+libgtkext4_la_CFLAGS = $(LIBGTK4_CFLAGS)
+
+
 devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libgtkext_la_SOURCES:%c=)
diff --git a/src/gtkext/hexdisplay.c b/src/gtkext/hexview.c
index 32bd69b..32bd69b 100644
--- a/src/gtkext/hexdisplay.c
+++ b/src/gtkext/hexview.c
diff --git a/src/gtkext/hexdisplay.h b/src/gtkext/hexview.h
index 9190548..9190548 100644
--- a/src/gtkext/hexdisplay.h
+++ b/src/gtkext/hexview.h