From f1cf10fe8623c17ea941eb82f0e5dbeb50f7792d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 13 Jun 2014 10:24:30 -0400 Subject: [PATCH] Generate gtk.gresource.xml This will help when including Adwaita. It will also let us drop the win32 theme on Linux, hopefully. --- gtk/Makefile.am | 23 +++++++++++++++++++++++ gtk/gtk.gresource.xml | 41 ----------------------------------------- 2 files changed, 23 insertions(+), 41 deletions(-) delete mode 100644 gtk/gtk.gresource.xml diff --git a/gtk/Makefile.am b/gtk/Makefile.am index e3cc5de00c..73e01b9244 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1374,6 +1374,29 @@ gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sour && cp xgen-gtbc gtktypebuiltins.c \ && rm -f xgen-gtbc +gtk.gresource.xml: + $(AM_V_GEN) echo -e "" > $@; \ + echo -e "" >> $@; \ + echo -e " " >> $@; \ + for f in $(srcdir)/resources/theme/Raleigh/*.css; do \ + n=`basename $$f`; \ + echo -e " theme/Raleigh/$$n" >> $@; \ + done; \ + for f in $(srcdir)/resources/theme/win32/*.css; do \ + n=`basename $$f`; \ + echo -e " theme/win32/$$n" >> $@; \ + done; \ + for f in $(srcdir)/resources/cursor/*.png; do \ + n=`basename $$f`; \ + echo -e " cursor/$$n" >> $@; \ + done; \ + for f in $(srcdir)/resources/ui/*.ui; do \ + n=`basename $$f`; \ + echo -e " ui/$$n" >> $@; \ + done; \ + echo -e " " >> $@; \ + echo -e "" >> $@; + resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(srcdir)/gtk.gresource.xml) gtkresources.h: gtk.gresource.xml $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \ diff --git a/gtk/gtk.gresource.xml b/gtk/gtk.gresource.xml deleted file mode 100644 index 91e0848796..0000000000 --- a/gtk/gtk.gresource.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - theme/Raleigh/gtk-default.css - theme/win32/gtk-win32.css - theme/win32/gtk-win32-xp.css - theme/win32/gtk-win32-base.css - theme/win32/gtk-win32-classic.css - cursor/dnd-ask.png - cursor/dnd-link.png - cursor/dnd-none.png - cursor/dnd-move.png - cursor/dnd-copy.png - ui/gtkaboutdialog.ui - ui/gtkactionbar.ui - ui/gtkappchooserdialog.ui - ui/gtkappchooserwidget.ui - ui/gtkassistant.ui - ui/gtkcolorchooserdialog.ui - ui/gtkcoloreditor.ui - ui/gtkdialog.ui - ui/gtkfilechooserbutton.ui - ui/gtkfilechooserwidget.ui - ui/gtkfilechooserdialog.ui - ui/gtkfontbutton.ui - ui/gtkfontchooserdialog.ui - ui/gtkfontchooserwidget.ui - ui/gtkinfobar.ui - ui/gtklockbutton.ui - ui/gtkmessagedialog.ui - ui/gtkpagesetupunixdialog.ui - ui/gtkpathbar.ui - ui/gtkprintunixdialog.ui - ui/gtkrecentchooserdefault.ui - ui/gtksearchbar.ui - ui/gtkscalebutton.ui - ui/gtkstatusbar.ui - ui/gtkvolumebutton.ui - ui/gtkapplication-quartz.ui - -