[Xfce4-commits] <xfwm4:master> Port the build system to use GtkBuilder.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to c62ca0d3ca9a8b13004eae5244ce39f64d81ecef (commit)
       from 849fe88cbb6b27bd4ef253bbcb165c961582a5a6 (commit)

commit c62ca0d3ca9a8b13004eae5244ce39f64d81ecef
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Feb 27 10:10:28 2010 +0100

    Port the build system to use GtkBuilder.

 configure.ac.in              |    1 -
 settings-dialogs/Makefile.am |   24 +++++++++---------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 36cd027..12d055c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -70,7 +70,6 @@ AC_CHECK_LIB([Xext], [XShapeCombineShape],
   ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS])
 
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
-XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [xfce_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], libxfce4ui-1, [libxfce4ui_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], libxfce4kbd-private-2, [libxfce4kbd_private_minimum_version])
diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am
index 739cd10..158a5f2 100644
--- a/settings-dialogs/Makefile.am
+++ b/settings-dialogs/Makefile.am
@@ -18,7 +18,6 @@ xfwm4_workspace_settings_SOURCES = \
 xfwm4_workspace_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GLADE_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCEGUI4_CFLAGS) \
@@ -32,7 +31,6 @@ xfwm4_workspace_settings_CFLAGS = \
 xfwm4_workspace_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
-	$(GLADE_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCEGUI4_LIBS) \
@@ -47,7 +45,6 @@ xfwm4_settings_SOURCES = \
 xfwm4_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GLADE_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
 	$(LIBXFCEGUI4_CFLAGS) \
 	$(LIBXFCE4KBD_PRIVATE_CFLAGS) \
@@ -59,7 +56,6 @@ xfwm4_settings_CFLAGS = \
 xfwm4_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
-	$(GLADE_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(LIBXFCEGUI4_LIBS) \
 	$(LIBXFCE4KBD_PRIVATE_LIBS) \
@@ -72,7 +68,6 @@ xfwm4_tweaks_settings_SOURCES = \
 xfwm4_tweaks_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GLADE_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
 	$(LIBXFCEGUI4_CFLAGS) \
 	$(LIBXFCONF_CFLAGS) \
@@ -83,7 +78,6 @@ xfwm4_tweaks_settings_CFLAGS = \
 xfwm4_tweaks_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
-	$(GLADE_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(LIBXFCEGUI4_LIBS) \
 	$(LIBXFCONF_LIBS)
@@ -95,18 +89,18 @@ if MAINTAINER_MODE
 
 BUILT_SOURCES = \
 monitor-icon.h \
-xfwm4-dialog_glade.h \
-xfwm4-tweaks-dialog_glade.h \
-xfwm4-workspace-dialog_glade.h
+xfwm4-dialog_ui.h \
+xfwm4-tweaks-dialog_ui.h \
+xfwm4-workspace-dialog_ui.h
 
-xfwm4-workspace-dialog_glade.h: xfwm4-workspace-dialog.glade
-	exo-csource --static --strip-comments --strip-content --name=workspace_dialog_glade $< >$@
+xfwm4-workspace-dialog_ui.h: xfwm4-workspace-dialog.glade
+	exo-csource --static --strip-comments --strip-content --name=workspace_dialog_ui $< >$@
 
-xfwm4-dialog_glade.h: xfwm4-dialog.glade
-	exo-csource --static --strip-comments --strip-content --name=xfwm4_dialog_glade $< >$@
+xfwm4-dialog_ui.h: xfwm4-dialog.glade
+	exo-csource --static --strip-comments --strip-content --name=xfwm4_dialog_ui $< >$@
 
-xfwm4-tweaks-dialog_glade.h: xfwm4-tweaks-dialog.glade
-	exo-csource --static --strip-comments --strip-content --name=tweaks_dialog_glade $< >$@
+xfwm4-tweaks-dialog_ui.h: xfwm4-tweaks-dialog.glade
+	exo-csource --static --strip-comments --strip-content --name=tweaks_dialog_ui $< >$@
 
 monitor-icon.h: $(srcdir)/monitor-icon.png
 	gdk-pixbuf-csource --raw --build-list \