summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2013-07-12 10:24:52 -0400
committerRyan Lortie <desrt@desrt.ca>2013-07-12 10:31:45 -0400
commit9bbcd71967ef40d22d41d5eaa910e3967c69c0cd (patch)
treead7286b5425c7d1a76e362eb7d75d17921146cda
parente2c8ed5dcd04527c382718a5652b1d4c94ca0f4b (diff)
downloaddconf-9bbcd71967ef40d22d41d5eaa910e3967c69c0cd.tar.gz
clean up dconf-editor gresource use
Fixing some distcheck issues...
-rw-r--r--editor/Makefile.am18
1 files changed, 12 insertions, 6 deletions
diff --git a/editor/Makefile.am b/editor/Makefile.am
index f59fa67..46ff003 100644
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@ -23,21 +23,27 @@ dconf_editor_CFLAGS = \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"\
-w
-resources.c: dconf-editor.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies dconf-editor.gresource.xml)
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --generate-source $<
+resource_data = \
+ dconf-editor.gresource.xml \
+ dconf-editor-menu.ui \
+ dconf-editor.ui
+
+resources.c: $(resource_data)
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --target=$@ --generate-source $<
+
+nodist_dconf_editor_SOURCES = resources.c
dconf_editor_SOURCES = \
config.vapi \
dconf-editor.vala \
dconf-model.vala \
dconf-schema.vala \
- dconf-view.vala \
- resources.c
+ dconf-view.vala
desktopdir = $(datadir)/applications
desktop_in_files = dconf-editor.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
-CLEANFILES = $(desktop_DATA)
+CLEANFILES = $(desktop_DATA) resources.c
@INTLTOOL_DESKTOP_RULE@
gsettings_SCHEMAS = ca.desrt.dconf-editor.gschema.xml
@@ -68,4 +74,4 @@ update-icon-cache:
gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; \
fi
-EXTRA_DIST = $(gsettings_SCHEMAS) $(icons)
+EXTRA_DIST = $(gsettings_SCHEMAS) $(icons) $(resource_data)