GNOME.org
 

libglade stuff committed

i've committed the libglade work mentioned yesterday.

i just moved the modules over - so that it will all Just Work without
lib init functions and there will be no overhead for apps which don't
use glade.

revision history was preserved for glade-*.c

i also had libglade use g_module_build_path().

attached is a patch.

jacob
-- 
"Beat mixing is 10000 times more fun than even video games."
	-- bt

Index: libglade/ChangeLog
===================================================================
RCS file: /cvs/gnome/libglade/ChangeLog,v
retrieving revision 1.193
diff -u -r1.193 ChangeLog
--- libglade/ChangeLog	2001/10/24 16:55:27	1.193
+++ libglade/ChangeLog	2001/10/24 19:14:25
@@ -1,5 +1,13 @@
 2001-10-24  jacob berkman  <jacob ximian com>
 
+	* glade/glade-init.c (glade_require): use g_module_build_path()
+
+	* glade/Makefile.am: remove bonobo, gnome, canvas modules as they
+	are moving to their respective modules
+
+	* configure.in: remove bonobo, gnome, canvas checks, bump version
+	to 1.99.3
+
 	* glade/Makefile.am: build canvas module
 
 	* glade/glade-gtk.c (clist_new): create a clist
Index: libglade/configure.in
===================================================================
RCS file: /cvs/gnome/libglade/configure.in,v
retrieving revision 1.58
diff -u -r1.58 configure.in
--- libglade/configure.in	2001/10/24 16:55:27	1.58
+++ libglade/configure.in	2001/10/24 19:14:25
@@ -1,6 +1,6 @@
 -*- mode: m4 -*-
 AC_PREREQ(2.52)
-AC_INIT(libglade, 1.99.2,
+AC_INIT(libglade, 1.99.3,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=libglade])
 
 AC_CONFIG_SRCDIR([test-libglade.c])
@@ -33,66 +33,6 @@
 PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.4.1 atk >= 0.6)
 AC_SUBST(XML_LIBS)
 AC_SUBST(XML_CFLAGS)
-
-dnl checks for the bonobo module ...
-AC_ARG_ENABLE(bonobo,
-  AC_HELP_STRING([--enable-bonobo], [enable bonobo support (yes/no/auto)]),,
-  [enable_bonobo=auto])
-build_bonobo=false
-if test "x$enable_bonobo" != xno; then
-  PKG_CHECK_MODULES(LIBGLADE_BONOBO,
-    [libbonoboui-2.0 >= 1.103.0 libxml-2.0 >= 2.4.1 atk >= 0.6],
-    build_bonobo=true,
-    [if test "x$enable_bonobo" = xyes; then
-       AC_MSG_ERROR([Bonobo support requested but libbonoboui-2.0 not found])
-     fi])
-fi
-AC_SUBST(LIBGLADE_BONOBO_CFLAGS)
-AC_SUBST(LIBGLADE_BONOBO_LIBS)
-AM_CONDITIONAL(BUILD_BONOBO, $build_bonobo)
-if $build_gnome; then
-    AC_DEFINE(WITH_BONOBO)
-fi
-
-dnl checks for the gnome module ...
-AC_ARG_ENABLE(gnome,
-  AC_HELP_STRING([--enable-gnome], [enable gnome support (yes/no/auto)]),,
-  [enable_gnome=auto])
-build_gnome=false
-if test "x$enable_gnome" != xno; then
-  PKG_CHECK_MODULES(LIBGLADE_GNOME,
-    [libgnomeui-2.0 >= 1.103.0 libxml-2.0 >= 2.4.1 atk >= 0.6],
-    build_gnome=true,
-    [if test "x$enable_gnome" = xyes; then
-       AC_MSG_ERROR([GNOME support requested but libgnomeui-2.0 not found])
-     fi])
-fi
-AC_SUBST(LIBGLADE_GNOME_CFLAGS)
-AC_SUBST(LIBGLADE_GNOME_LIBS)
-AM_CONDITIONAL(BUILD_GNOME, $build_gnome)
-if $build_gnome; then
-    AC_DEFINE(WITH_GNOME)
-fi
-
-dnl checks for the canvas module ...
-AC_ARG_ENABLE(canvas,
-  AC_HELP_STRING([--enable-canvas], [enable canvas support (yes/no/auto)]),,
-  [enable_canvas=auto])
-build_canvas=false
-if test "x$enable_canvas" != xno; then
-  PKG_CHECK_MODULES(LIBGLADE_CANVAS,
-    [libgnomecanvas-2.0 >= 1.103.0],
-    build_canvas=true,
-    [if test "x$enable_canvas" = xyes; then
-       AC_MSG_ERROR([Canvas support requested but libgnomecanvas-2.0 not found])
-     fi])
-fi
-AC_SUBST(LIBGLADE_CANVAS_CFLAGS)
-AC_SUBST(LIBGLADE_CANVAS_LIBS)
-AM_CONDITIONAL(BUILD_CANVAS, $build_canvas)
-if $build_canvas; then
-    AC_DEFINE(WITH_CANVAS)
-fi
 
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
 AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
Index: libglade/glade/Makefile.am
===================================================================
RCS file: /cvs/gnome/libglade/glade/Makefile.am,v
retrieving revision 1.44
diff -u -r1.44 Makefile.am
--- libglade/glade/Makefile.am	2001/10/24 16:55:29	1.44
+++ libglade/glade/Makefile.am	2001/10/24 19:14:25
@@ -13,22 +13,9 @@
 	$(GTK_CFLAGS) -DGLADE_MODULE_DIR=\""$(glademoduledir)"\" \
 	$(LIBGLADE_BONOBO_CFLAGS) $(LIBGLADE_GNOME_CFLAGS)
 
-glademoduledir = $(pkglibdir)/2.0
+glademoduledir = $(libdir)/libglade/2.0
 
-if BUILD_BONOBO
-bonobo_la = bonobo.la
-endif
-
-if BUILD_GNOME
-gnome_la = gnome.la
-endif
-
-if BUILD_CANVAS
-canvas_la = canvas.la
-endif
-
 lib_LTLIBRARIES = libglade-2.0.la
-glademodule_LTLIBRARIES = $(bonobo_la) $(gnome_la) $(canvas_la)
 
 gladeincludedir      = $(includedir)/libglade-2.0/glade
 gladeinclude_HEADERS = \
@@ -49,20 +36,6 @@
 libglade_2_0_la_LIBADD   = $(GTK_LIBS) $(XML_LIBS)
 libglade_2_0_la_LDFLAGS  = -version-info $(LTVERSION)
 
-bonobo_la_SOURCES = glade-bonobo.c
-bonobo_la_LIBADD = libglade-2.0.la $(LIBGLADE_BONOBO_LIBS)
-bonobo_la_LDFLAGS = -export-dynamic -module -avoid-version
-
-gnome_la_SOURCES = glade-gnome.c
-gnome_la_LIBADD = libglade-2.0.la $(LIBGLADE_GNOME_LIBS)
-gnome_la_LDFLAGS = -export-dynamic -module -avoid-version
-
-canvas_la_SOURCES = glade-canvas.c
-canvas_la_LIBADD = libglade-2.0.la $(LIBGLADE_CANVAS_LIBS)
-canvas_la_LDFLAGS = -export-dynamic -module -avoid-version
-
 EXTRA_DIST = $(gladeinclude_HEADERS) \
 	makefile.mingw	\
 	glade.def
-
-inst-lib: install-glademoduleLTLIBRARIES
\ No newline at end of file
Index: libglade/glade/glade-init.c
===================================================================
RCS file: /cvs/gnome/libglade/glade/glade-init.c,v
retrieving revision 1.14
diff -u -r1.14 glade-init.c
--- libglade/glade/glade-init.c	2001/10/09 00:39:52	1.14
+++ libglade/glade/glade-init.c	2001/10/24 19:14:25
@@ -92,8 +92,7 @@
     if (already_loaded)
 	return;
 
-    filename = g_strconcat(GLADE_MODULE_DIR, G_DIR_SEPARATOR_S, library,
-			   ".la", NULL);
+    filename = g_module_build_path (GLADE_MODULE_DIR, library);
     module = g_module_open(filename, G_MODULE_BIND_LAZY);
     if (!module) {
 	g_warning("Could not load support for `%s': %s", library,
Index: libgnomecanvas/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/ChangeLog,v
retrieving revision 1.37
diff -u -r1.37 ChangeLog
--- libgnomecanvas/ChangeLog	2001/10/08 11:31:26	1.37
+++ libgnomecanvas/ChangeLog	2001/10/24 19:14:25
@@ -1,3 +1,11 @@
+2001-10-24  jacob berkman  <jacob ximian com>
+
+	* glade/glade-canvas.c: moved from libglade/glade/
+
+	* configure.in: add libglade checks
+
+	* Makefile.am (SUBDIRS): build glade/
+
 2001-10-08  Stanislav Visnovsky  <visnovsky nenya ms mff cuni cz>
 
 	* configure.in: Added "sk" to ALL_LINGUAS.
Index: libgnomecanvas/Makefile.am
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- libgnomecanvas/Makefile.am	2001/09/18 18:26:54	1.4
+++ libgnomecanvas/Makefile.am	2001/10/24 19:14:25
@@ -1,3 +1,3 @@
-SUBDIRS = libgnomecanvas demos po
+SUBDIRS = libgnomecanvas glade demos po
 
 EXTRA_DIST = message-of-doom COPYING.LIB
Index: libgnomecanvas/configure.in
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/configure.in,v
retrieving revision 1.34
diff -u -r1.34 configure.in
--- libgnomecanvas/configure.in	2001/10/08 11:31:26	1.34
+++ libgnomecanvas/configure.in	2001/10/24 19:14:25
@@ -30,10 +30,18 @@
 dnl
 dnl GTK+ check
 dnl
-PKG_CHECK_MODULES(LIBGNOMECANVAS, gtk+-2.0 >= 1.3.2 libart-2.0 >= 2.3.5 pango >= 0.13 pangoft2 >= 0.13)
+CANVAS_MODULES="gtk+-2.0 >= 1.3.2 libart-2.0 >= 2.3.5 pango >= 0.13 pangoft2 >= 0.13"
+PKG_CHECK_MODULES(LIBGNOMECANVAS, $CANVAS_MODULES)
 AC_SUBST(LIBGNOMECANVAS_CFLAGS)
 AC_SUBST(LIBGNOMECANVAS_LIBS)
 
+PKG_CHECK_MODULES(CANVAS_GLADE, $CANVAS_MODULES libglade-2.0 >= 1.99.3)
+AC_SUBST(CANVAS_GLADE_CFLAGS)
+AC_SUBST(CANVAS_GLADE_LIBS)
+
+GLADE_MODULE_DIR="`$PKG_CONFIG --variable=moduledir libglade-2.0`"
+AC_SUBST(GLADE_MODULE_DIR)
+
 dnl Don't use AC_PROG_AWK since we need the full pathname.
 AC_PATH_PROGS(AWK, mawk gawk nawk awk, )
 AC_PATH_PROGS(PERL, perl5 perl)
@@ -58,6 +66,7 @@
 po/Makefile.in
 libgnomecanvas/Makefile
 libgnomecanvas/libgnomecanvas-2.0.pc
+glade/Makefile
 demos/Makefile
 ])
 
Index: libgnomeui/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomeui/ChangeLog,v
retrieving revision 1.51
diff -u -r1.51 ChangeLog
--- libgnomeui/ChangeLog	2001/09/27 07:04:58	1.51
+++ libgnomeui/ChangeLog	2001/10/24 19:14:25
@@ -1,3 +1,11 @@
+2001-10-24  jacob berkman  <jacob ximian com>
+
+	* glade/glade-gnome.c: move from libglade/glade/
+
+	* configure.in: add libglade check
+
+	* Makefile.am (SUBDIRS): build glade/
+
 2001-09-26  Anders Carlsson  <andersca gnu org>
 
 	* configure.in: Up to 1.104.0 and require libgnome 1.104.0 and
Index: libgnomeui/Makefile.am
===================================================================
RCS file: /cvs/gnome/libgnomeui/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- libgnomeui/Makefile.am	2001/08/14 14:42:03	1.9
+++ libgnomeui/Makefile.am	2001/10/24 19:14:25
@@ -1,4 +1,4 @@
-SUBDIRS = libgnomeui images demos test-gnome doc po
+SUBDIRS = libgnomeui glade images demos test-gnome doc po
 
 EXTRA_DIST = message-of-doom
 
Index: libgnomeui/configure.in
===================================================================
RCS file: /cvs/gnome/libgnomeui/configure.in,v
retrieving revision 1.45
diff -u -r1.45 configure.in
--- libgnomeui/configure.in	2001/10/14 12:02:49	1.45
+++ libgnomeui/configure.in	2001/10/24 19:14:25
@@ -49,24 +49,26 @@
 dnl
 dnl Start of pkg-config checks
 dnl
-PKG_CHECK_MODULES(LIBGNOMEUI, \
-		  libgnome-2.0 >= 1.104.0 libgnomecanvas-2.0 >= 1.104.0 \
-		  libbonoboui-2.0 >= 1.97.0 gconf-2.0 >= 1.1.1 )
+GNOMEUI_MODULES="libgnome-2.0 >= 1.104.0 libgnomecanvas-2.0 >= 1.104.0 libbonoboui-2.0 >= 1.97.0 gconf-2.0 >= 1.1.1"
+PKG_CHECK_MODULES(LIBGNOMEUI, $GNOMEUI_MODULES)
 AC_SUBST(LIBGNOMEUI_CFLAGS)
 AC_SUBST(LIBGNOMEUI_LIBS)
 
-PKG_CHECK_MODULES(LIBGNOMEUI_COMPONENTS, \
-		  libgnome-2.0 >= 1.104.0 libgnomecanvas-2.0 >= 1.104.0 \
-		  libbonoboui-2.0 >= 1.97.0 gconf-2.0 >= 1.1.1)
+PKG_CHECK_MODULES(LIBGNOMEUI_COMPONENTS, $GNOMEUI_MODULES)
 AC_SUBST(LIBGNOMEUI_COMPONENTS_CFLAGS)
 AC_SUBST(LIBGNOMEUI_COMPONENTS_LIBS)
 
-PKG_CHECK_MODULES(LIBGNOMEUI_DEMOS, \
-		  libgnome-2.0 >= 1.104.0 libgnomecanvas-2.0 >= 1.104.0 \
-		  libbonoboui-2.0 >= 1.97.0 gconf-2.0 >= 1.1.1)
+PKG_CHECK_MODULES(LIBGNOMEUI_DEMOS, $GNOMEUI_MODULES)
 AC_SUBST(LIBGNOMEUI_DEMOS_CFLAGS)
 AC_SUBST(LIBGNOMEUI_DEMOS_LIBS)
 
+PKG_CHECK_MODULES(LIBGNOMEUI_GLADE, $GNOMEUI_MODULES libglade-2.0 >= 1.99.3)
+AC_SUBST(LIBGNOMEUI_GLADE_CFLAGS)
+AC_SUBST(LIBGNOMEUI_GLADE_LIBS)
+
+GLADE_MODULE_DIR="`$PKG_CONFIG --variable=moduledir libglade-2.0`"
+AC_SUBST(GLADE_MODULE_DIR)
+
 dnl
 dnl Check for gtk-doc
 dnl
@@ -153,6 +155,7 @@
 libgnomeui/Makefile
 libgnomeui/libgnomeui-2.0.pc
 libgnomeui/pixmaps/Makefile
+glade/Makefile
 images/Makefile
 demos/Makefile
 test-gnome/Makefile
Index: libbonoboui/ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.145
diff -u -r1.145 ChangeLog
--- libbonoboui/ChangeLog	2001/10/23 06:25:19	1.145
+++ libbonoboui/ChangeLog	2001/10/24 19:14:25
@@ -1,3 +1,11 @@
+2001-10-24  jacob berkman  <jacob ximian com>
+
+	* glade/glade-bonobo.c: move from libglade/glade/
+
+	* configure.in: add libglade checks
+
+	* Makefile.am: build glade/
+
 2001-10-24  Michael Meeks  <michael ximian com>
 
 	* Upd. all factories from _OAF_FACTORY to _ACTIVATION_FACTORY.
Index: libbonoboui/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- libbonoboui/Makefile.am	2001/09/07 12:44:18	1.10
+++ libbonoboui/Makefile.am	2001/10/24 19:14:25
@@ -1,4 +1,4 @@
-SUBDIRS = bonobo samples tests po doc
+SUBDIRS = bonobo glade samples tests po doc
 
 libincludedir = $(includedir)/gnome-2.0
 libinclude_HEADERS =    \
Index: libbonoboui/configure.in
===================================================================
RCS file: /cvs/gnome/libbonoboui/configure.in,v
retrieving revision 1.34
diff -u -r1.34 configure.in
--- libbonoboui/configure.in	2001/10/23 01:44:05	1.34
+++ libbonoboui/configure.in	2001/10/24 19:14:25
@@ -33,12 +33,18 @@
 dnl
 dnl Start of pkg-config checks
 dnl
-PKG_CHECK_MODULES(BONOBOUI, libgnomecanvas-2.0 >= 1.96.0 \
-		  libbonobo-2.0 >= 1.101.2 libgnome-2.0 >= 1.96.0 \
-		  bonobo-activation-2.0 >= 0.9.1 gconf-2.0)
+BONOBOUI_MODULES="libgnomecanvas-2.0 >= 1.96.0 libbonobo-2.0 >= 1.101.2 libgnome-2.0 >= 1.96.0 bonobo-activation-2.0 >= 0.9.1 gconf-2.0"
+PKG_CHECK_MODULES(BONOBOUI, $BONOBOUI_MODULES)
 AC_SUBST(BONOBOUI_CFLAGS)
 AC_SUBST(BONOBOUI_LIBS)
 
+PKG_CHECK_MODULES(BONOBOUI_GLADE, $BONOBOUI_MODULES libglade-2.0 >= 1.99.3)
+AC_SUBST(BONOBOUI_GLADE_CFLAGS)
+AC_SUBST(BONOBOUI_GLADE_LIBS)
+ 
+GLADE_MODULE_DIR="`$PKG_CONFIG --variable=moduledir libglade-2.0`"
+AC_SUBST(GLADE_MODULE_DIR)
+
 # glib-genmarshal
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
@@ -47,6 +53,7 @@
 po/Makefile.in
 bonobo/Makefile
 bonobo/libbonoboui-2.0.pc
+glade/Makefile
 samples/Makefile
 samples/controls/Makefile
 samples/bonoboui/Makefile
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]