diff options
| author | Vincent Untz <[email protected]> | 2012-02-02 12:05:20 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-04-26 13:01:37 +0200 |
| commit | c61d3711954a959ebc7c957ac4f39c8ca3b783e9 (patch) | |
| tree | 075a5d2f53d3debee0a1d24428f762925e6e0a35 /applets/fish/Makefile.am | |
| parent | b6372ca5fab62bcd963ee2a01d82955f93829e01 (diff) | |
| download | mate-panel-c61d3711954a959ebc7c957ac4f39c8ca3b783e9.tar.bz2 mate-panel-c61d3711954a959ebc7c957ac4f39c8ca3b783e9.tar.xz | |
fish: Convert to GResource
origin commits:
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=5478111
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=695d30c
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=00f9870
Diffstat (limited to 'applets/fish/Makefile.am')
| -rw-r--r-- | applets/fish/Makefile.am | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am index 7f63cf5f..e43cb57f 100644 --- a/applets/fish/Makefile.am +++ b/applets/fish/Makefile.am @@ -6,13 +6,13 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libmate-panel-applet \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DFISH_ICONDIR=\""$(fishbitmapsdir)"\" \ - -DFISH_BUILDERDIR=\""$(uidir)"\" \ - -DFISH_MENU_UI_DIR=\""$(xmluidir)"\" \ $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) -FISH_SOURCES = fish.c +FISH_SOURCES = \ + fish.c \ + $(BUILT_SOURCES) FISH_LDADD = \ ../../libmate-panel-applet/libmate-panel-applet-4.la \ @@ -71,11 +71,19 @@ fishbitmaps_DATA = \ footguy.png \ monkey.png -uidir = $(datadir)/mate-panel/ui -ui_DATA = fish.ui +ui_FILES = \ + fish.ui \ + fish-menu.xml -xmluidir = $(datadir)/mate-panel/ui -xmlui_DATA = fish-menu.xml +fish-resources.c: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/fish.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $< + +fish-resources.h: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/fish.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $< + +BUILT_SOURCES = \ + fish-resources.c \ + fish-resources.h fish_gschemas_in = org.mate.panel.applet.fish.gschema.xml.in gsettings_SCHEMAS = $(fish_gschemas_in:.xml.in=.xml) @@ -87,10 +95,10 @@ EXTRA_DIST = \ $(fishbitmaps_DATA) \ org.mate.panel.FishApplet.mate-panel-applet.in.in \ $(service_in_files) \ - $(ui_DATA) \ - $(xmlui_DATA) \ + $(ui_FILES) \ + fish.gresource.xml \ $(fish_gschemas_in) -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) +CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) -include $(top_srcdir)/git.mk |