diff options
| author | Vincent Untz <[email protected]> | 2012-02-02 14:54:58 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-04-26 13:05:10 +0200 |
| commit | 6b461deac9fb64ff6c92958475497b7050b0bc94 (patch) | |
| tree | dab6d30cfd9d0750b84604fe795e9f96c1905c62 /mate-panel/Makefile.am | |
| parent | 72982f7175c1badf2b177cc9eeaa3e696551f354 (diff) | |
| download | mate-panel-6b461deac9fb64ff6c92958475497b7050b0bc94.tar.bz2 mate-panel-6b461deac9fb64ff6c92958475497b7050b0bc94.tar.xz | |
panel: Convert to GResource
origin commits:
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=9fca67f
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=695d30c
https://git.gnome.org/browse/gnome-panel/patch/?id=00f9870cb28e6ef657d1
Diffstat (limited to 'mate-panel/Makefile.am')
| -rw-r--r-- | mate-panel/Makefile.am | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am index b108288b..6de930be 100644 --- a/mate-panel/Makefile.am +++ b/mate-panel/Makefile.am @@ -13,19 +13,14 @@ AM_CPPFLAGS = \ -I$(top_builddir)/mate-panel \ -I$(top_builddir)/mate-panel/libpanel-util \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DBUILDERDIR=\""$(uidir)"\" \ -DPANELDATADIR=\""$(datadir)/mate-panel"\" \ - -DDATADIR=\""$(datadir)"\" - -DICONDIR=\""$(datadir)/mate-panel/pixmaps"\" \ + -DDATADIR=\""$(datadir)"\" \ $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) panel_sources = \ - panel-typebuiltins.c \ - panel-typebuiltins.h \ - panel-marshal.c \ - panel-marshal.h \ + $(mate_panel_BUILT_SOURCES) \ main.c \ panel-widget.c \ button-widget.c \ @@ -159,10 +154,10 @@ mate_desktop_item_edit_LDADD = \ -lX11 mate_panel_test_applets_SOURCES = \ + $(panel_test_applets_BUILT_SOURCES) \ panel-modules.c \ panel-applet-info.c \ panel-applets-manager.c \ - panel-marshal.c \ panel-test-applets.c mate_panel_test_applets_CPPFLAGS = \ @@ -218,17 +213,41 @@ panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers) --eprod "GType @enum_name@_get_type (void);\n" \ $(panel_enum_headers) > $@ -BUILT_SOURCES = \ +mate_panel_BUILT_SOURCES = \ panel-typebuiltins.c \ panel-typebuiltins.h \ + panel-resources.c \ + panel-resources.h \ panel-marshal.c \ panel-marshal.h -uidir = $(datadir)/mate-panel/ui -ui_DATA = \ +panel_test_applets_BUILT_SOURCES = \ + panel-test-applets-resources.c \ + panel-test-applets-resources.h \ + panel-marshal.c \ + panel-marshal.h + +BUILT_SOURCES = \ + $(mate_panel_BUILT_SOURCES) \ + $(panel_test_applets_BUILT_SOURCES) + +ui_FILES = \ panel-properties-dialog.ui \ - panel-run-dialog.ui \ - panel-test-applets.ui + panel-run-dialog.ui + +panel-resources.c: panel.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/panel.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $< + +panel-resources.h: panel.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/panel.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $< + +uitest_FILES = panel-test-applets.ui + +panel-test-applets-resources.c: panel-test-applets.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/panel-test-applets.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $< + +panel-test-applets-resources.h: panel-test-applets.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/panel-test-applets.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $< desktopdir = $(datadir)/applications desktop_in_files = mate-panel.desktop.in @@ -237,7 +256,10 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ - $(ui_DATA) \ + $(ui_FILES) \ + panel.gresource.xml \ + $(uitest_FILES) \ + panel-test-applets.gresource.xml \ panel-marshal.list \ $(entries_DATA) \ $(desktop_in_files) |