Stop using extract-headers

Since 0.18.3, xgettext can extract strings from ui files.
This commit is contained in:
Matthias Clasen 2015-02-01 14:34:37 -05:00
parent b3a5d86d5d
commit b08015371b
2 changed files with 43 additions and 50 deletions

View File

@ -1078,12 +1078,6 @@ templates = \
ui/gtkstatusbar.ui \
ui/gtkvolumebutton.ui
template_headers = $(templates:.ui=.ui.h)
%.ui.h: %.ui
$(AM_V_GEN) mkdir -p $(dir $@) \
&& $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
#
# rules to generate built sources
#
@ -1210,7 +1204,7 @@ resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --gener
gtkresources.h: gtk.gresource.xml
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register
gtkresources.c: gtk.gresource.xml $(resource_files) $(template_headers)
gtkresources.c: gtk.gresource.xml $(resource_files)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register
@ -1470,7 +1464,6 @@ EXTRA_DIST += \
$(resource_files) \
$(theme_sources) \
$(gsettings_SCHEMAS) \
$(template_headers) \
a11y/Makefile.inc \
deprecated/Makefile.inc \
inspector/Makefile.inc \

View File

@ -283,36 +283,36 @@ gtk/gtkvolumebutton.c
gtk/gtkwidget.c
gtk/gtkwindow.c
gtk/inspector/action-editor.c
gtk/inspector/actions.ui.h
gtk/inspector/actions.ui
gtk/inspector/classes-list.c
gtk/inspector/classes-list.ui.h
gtk/inspector/classes-list.ui
gtk/inspector/css-editor.c
gtk/inspector/css-editor.ui.h
gtk/inspector/data-list.ui.h
gtk/inspector/css-editor.ui
gtk/inspector/data-list.ui
gtk/inspector/general.c
gtk/inspector/general.ui.h
gtk/inspector/general.ui
gtk/inspector/gestures.c
gtk/inspector/inspect-button.c
gtk/inspector/menu.c
gtk/inspector/magnifier.ui.h
gtk/inspector/menu.ui.h
gtk/inspector/magnifier.ui
gtk/inspector/menu.ui
gtk/inspector/misc-info.c
gtk/inspector/misc-info.ui.h
gtk/inspector/object-hierarchy.ui.h
gtk/inspector/object-tree.ui.h
gtk/inspector/misc-info.ui
gtk/inspector/object-hierarchy.ui
gtk/inspector/object-tree.ui
gtk/inspector/prop-editor.c
gtk/inspector/prop-list.ui.h
gtk/inspector/resource-list.ui.h
gtk/inspector/selector.ui.h
gtk/inspector/prop-list.ui
gtk/inspector/resource-list.ui
gtk/inspector/selector.ui
gtk/inspector/signals-list.c
gtk/inspector/signals-list.ui.h
gtk/inspector/signals-list.ui
gtk/inspector/size-groups.c
gtk/inspector/statistics.ui.h
gtk/inspector/style-prop-list.ui.h
gtk/inspector/statistics.ui
gtk/inspector/style-prop-list.ui
gtk/inspector/visual.c
gtk/inspector/visual.ui.h
gtk/inspector/visual.ui
gtk/inspector/window.c
gtk/inspector/window.ui.h
gtk/inspector/window.ui
gtk/paper_names_offsets.c
gtk/updateiconcache.c
modules/input/gtkimcontextxim.c
@ -338,27 +338,27 @@ modules/printbackends/file/gtkprintbackendfile.c
modules/printbackends/lpr/gtkprintbackendlpr.c
modules/printbackends/papi/gtkprintbackendpapi.c
modules/printbackends/test/gtkprintbackendtest.c
gtk/ui/gtkaboutdialog.ui.h
gtk/ui/gtkappchooserdialog.ui.h
gtk/ui/gtkappchooserwidget.ui.h
gtk/ui/gtkapplication-quartz.ui.h
gtk/ui/gtkassistant.ui.h
gtk/ui/gtkcolorchooserdialog.ui.h
gtk/ui/gtkcoloreditor.ui.h
gtk/ui/gtkdialog.ui.h
gtk/ui/gtkfilechooserbutton.ui.h
gtk/ui/gtkfilechooserdialog.ui.h
gtk/ui/gtkfilechooserwidget.ui.h
gtk/ui/gtkfontbutton.ui.h
gtk/ui/gtkfontchooserdialog.ui.h
gtk/ui/gtkfontchooserwidget.ui.h
gtk/ui/gtkinfobar.ui.h
gtk/ui/gtklockbutton.ui.h
gtk/ui/gtkmessagedialog.ui.h
gtk/ui/gtkpagesetupunixdialog.ui.h
gtk/ui/gtkpathbar.ui.h
gtk/ui/gtkprintunixdialog.ui.h
gtk/ui/gtkrecentchooserdefault.ui.h
gtk/ui/gtkscalebutton.ui.h
gtk/ui/gtkstatusbar.ui.h
gtk/ui/gtkvolumebutton.ui.h
gtk/ui/gtkaboutdialog.ui
gtk/ui/gtkappchooserdialog.ui
gtk/ui/gtkappchooserwidget.ui
gtk/ui/gtkapplication-quartz.ui
gtk/ui/gtkassistant.ui
gtk/ui/gtkcolorchooserdialog.ui
gtk/ui/gtkcoloreditor.ui
gtk/ui/gtkdialog.ui
gtk/ui/gtkfilechooserbutton.ui
gtk/ui/gtkfilechooserdialog.ui
gtk/ui/gtkfilechooserwidget.ui
gtk/ui/gtkfontbutton.ui
gtk/ui/gtkfontchooserdialog.ui
gtk/ui/gtkfontchooserwidget.ui
gtk/ui/gtkinfobar.ui
gtk/ui/gtklockbutton.ui
gtk/ui/gtkmessagedialog.ui
gtk/ui/gtkpagesetupunixdialog.ui
gtk/ui/gtkpathbar.ui
gtk/ui/gtkprintunixdialog.ui
gtk/ui/gtkrecentchooserdefault.ui
gtk/ui/gtkscalebutton.ui
gtk/ui/gtkstatusbar.ui
gtk/ui/gtkvolumebutton.ui