gnome-terminal r2705 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:46:50 2008
New Revision: 2705
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2705&view=rev

Log:
Convert to the builder format at build time.


Removed:
   trunk/src/profile-preferences.ui
Modified:
   trunk/configure.in
   trunk/src/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu May 29 19:46:50 2008
@@ -71,6 +71,11 @@
 GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
 AC_SUBST([GLIB_MKENUMS])
 
+AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
+if test "$GTK_BUILDER_CONVERT" = "false"; then
+  AC_MSG_ERROR([gtk-builder-convert not found])
+fi
+
 GNOME_DOC_INIT
 
 AC_CONFIG_FILES([

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu May 29 19:46:50 2008
@@ -83,27 +83,35 @@
 schema_in_files = gnome-terminal.schemas.in
 schema_DATA = gnome-terminal.schemas
 
-uidir = $(pkgdatadir)
-ui_DATA = \
-	terminal.ui \
-	encodings-dialog.ui \
-	keybinding-editor.ui \
-	profile-manager.ui \
-	profile-new-dialog.ui \
-	profile-preferences.ui \
-	skey-challenge.ui \
+uimanagerdir = $(pkgdatadir)
+uimanager_DATA = \
+	terminal.xml \
 	$(NULL)
 
+builder_in_files = \
+	encodings-dialog.glade \
+	keybinding-editor.glade \
+	profile-manager.glade \
+	profile-new-dialog.glade \
+	profile-preferences.glade \
+	skey-challenge.glade \
+	$(NULL)
+
+builderdir = $(pkgdatadir)
+builder_DATA = $(builder_in_files:.glade=.ui)
+
 CLEANFILES = \
 	gnome-terminal.schemas \
 	stamp-terminal-type-builtins.h \
+	$(builder_DATA) \
 	$(BUILT_SOURCES)
 
 EXTRA_DIST = \
 	$(icon_DATA) \
 	$(schema_in_files) \
 	$(server_DATA) \
-	$(ui_DATA) \
+	$(uimanager_DATA) \
+	$(builder_in_files) \
 	$(NULL)
 
 serverdir = $(libdir)/bonobo/servers
@@ -115,3 +123,6 @@
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/src/$(schema_DATA)
 endif
+
+%.ui: %.glade
+	$(GTK_BUILDER_CONVERT) $< $@