diff options
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | plugins/gtk+/Makefile.am | 12 | ||||
-rw-r--r-- | plugins/gtk+/gtk+.xml (renamed from plugins/gtk+/gtk+.xml.in) | 0 | ||||
-rw-r--r-- | plugins/gtk+/gtkunixprint.xml (renamed from plugins/gtk+/gtkunixprint.xml.in) | 0 | ||||
-rw-r--r-- | plugins/webkit2gtk/Makefile.am | 9 | ||||
-rw-r--r-- | plugins/webkit2gtk/webkit2gtk.xml (renamed from plugins/webkit2gtk/webkit2gtk.xml.in) | 0 | ||||
-rw-r--r-- | po/POTFILES.in | 6 | ||||
-rw-r--r-- | po/POTFILES.skip | 7 |
8 files changed, 9 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index 1d0b871c..fffccfba 100644 --- a/configure.ac +++ b/configure.ac @@ -352,12 +352,9 @@ plugins/gtk+/Makefile plugins/gtk+/icons/Makefile plugins/gtk+/icons/16x16/Makefile plugins/gtk+/icons/22x22/Makefile -plugins/gtk+/gtk+.xml -plugins/gtk+/gtkunixprint.xml plugins/python/Makefile plugins/gladeui/Makefile plugins/webkit2gtk/Makefile -plugins/webkit2gtk/webkit2gtk.xml po/Makefile.in doc/Makefile doc/version.xml diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am index bb251665..d5f1ec05 100644 --- a/plugins/gtk+/Makefile.am +++ b/plugins/gtk+/Makefile.am @@ -261,14 +261,12 @@ endif # catalog data catalogsdir = $(pkgdatadir)/catalogs - -catalogs_in_files = gtk+.xml.in +catalogs_DATA = gtk+.xml if HAVE_GTK_UNIX_PRINT -catalogs_in_files += gtkunixprint.xml.in +catalogs_DATA += gtkunixprint.xml endif -catalogs_DATA = $(catalogs_in_files:.xml.in=.xml) BUILT_SOURCES = \ glade-gtk-marshallers.c \ @@ -335,13 +333,11 @@ UI_FILES = \ EXTRA_DIST = \ $(UI_FILES) \ glade-gtk-marshallers.list \ - $(catalogs_in_files) \ - $(catalog_DATA) \ + $(catalogs_DATA) \ glade-gtk-resources.gresource.xml CLEANFILES = \ - $(BUILT_SOURCES) \ - $(catalog_DATA) + $(BUILT_SOURCES) # # Marshaller generation diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml index a90b5182..a90b5182 100644 --- a/plugins/gtk+/gtk+.xml.in +++ b/plugins/gtk+/gtk+.xml diff --git a/plugins/gtk+/gtkunixprint.xml.in b/plugins/gtk+/gtkunixprint.xml index f49bed8d..f49bed8d 100644 --- a/plugins/gtk+/gtkunixprint.xml.in +++ b/plugins/gtk+/gtkunixprint.xml diff --git a/plugins/webkit2gtk/Makefile.am b/plugins/webkit2gtk/Makefile.am index 9a46901a..016e18dc 100644 --- a/plugins/webkit2gtk/Makefile.am +++ b/plugins/webkit2gtk/Makefile.am @@ -30,11 +30,6 @@ endif # catalog data catalogsdir = $(pkgdatadir)/catalogs +catalogs_DATA = webkit2gtk.xml -catalogs_in_files = webkit2gtk.xml.in - -catalogs_DATA = $(catalogs_in_files:.xml.in=.xml) - -EXTRA_DIST = $(catalogs_in_files) $(catalog_DATA) - -CLEANFILES = $(catalog_DATA) +EXTRA_DIST = $(catalogs_DATA) diff --git a/plugins/webkit2gtk/webkit2gtk.xml.in b/plugins/webkit2gtk/webkit2gtk.xml index b44cf7a3..b44cf7a3 100644 --- a/plugins/webkit2gtk/webkit2gtk.xml.in +++ b/plugins/webkit2gtk/webkit2gtk.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index 76ac411c..a6be3162 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -189,8 +189,8 @@ plugins/gtk+/glade-treeview-editor.c plugins/gtk+/glade-viewport-editor.c plugins/gtk+/glade-widget-editor.c plugins/gtk+/glade-window-editor.c -plugins/gtk+/gtkunixprint.xml.in -plugins/gtk+/gtk+.xml.in +plugins/gtk+/gtkunixprint.xml +plugins/gtk+/gtk+.xml plugins/gtk+/glade-about-dialog-editor.ui plugins/gtk+/glade-action-bar-editor.ui plugins/gtk+/glade-action-editor.ui @@ -246,4 +246,4 @@ plugins/gtk+/glade-widget-editor.ui plugins/gtk+/glade-window-editor.ui # webkit2gtk plugin backend -plugins/webkit2gtk/webkit2gtk.xml.in +plugins/webkit2gtk/webkit2gtk.xml diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 5e5adf06..7adf6159 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -3,13 +3,6 @@ # Main application data/glade.desktop.in -# gtk plugin backend -plugins/gtk+/gtkunixprint.xml -plugins/gtk+/gtk+.xml - -# webkit2gtk plugin backend -plugins/webkit2gtk/webkit2gtk.xml - # Test data tests/toplevel_order_test5.glade tests/toplevel_order_test6.glade |