summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@gnome.org>2016-09-18 16:03:30 -0500
committerMichael Catanzaro <mcatanzaro@gnome.org>2016-09-18 16:03:30 -0500
commit02b1b175cea12b61a0bca40fc3d735ef1606a062 (patch)
tree4d54d01520d13102bbb262ab97d78be174a1cc2f
parent112dec4f750e83a6884eba26a9efb12ac5611c0a (diff)
downloadepiphany-02b1b175cea12b61a0bca40fc3d735ef1606a062.tar.gz
Fix handling of the new stamp file
Doesn't work if the generated files don't depend on the stamp file
-rw-r--r--src/search-provider/Makefile.am15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/search-provider/Makefile.am b/src/search-provider/Makefile.am
index 139b92b37..b0a0a4bd8 100644
--- a/src/search-provider/Makefile.am
+++ b/src/search-provider/Makefile.am
@@ -1,9 +1,6 @@
BUILT_SOURCES = \
ephy-shell-search-provider-generated.stamp \
- $(dbus_shell_search_provider_built_sources)
-
-dbus_shell_search_provider_built_sources = \
- ephy-shell-search-provider-generated.c \
+ ephy-shell-search-provider-generated.c \
ephy-shell-search-provider-generated.h
dist_noinst_DATA = org.gnome.ShellSearchProvider2.xml
@@ -14,7 +11,8 @@ epiphany_search_provider_SOURCES = \
ephy-search-provider.h \
ephy-search-provider.c \
ephy-search-provider-main.c \
- $(dbus_shell_search_provider_built_sources)
+ ephy-shell-search-provider-generated.c \
+ ephy-shell-search-provider-generated.h
epiphany_search_provider_CFLAGS = \
$(WARN_CFLAGS)
@@ -51,6 +49,9 @@ epiphany_search_provider_LDFLAGS = \
-dlopen self \
$(WARN_LDFLAGS)
+ephy-shell-search-provider-generated.c : ephy-shell-search-provider-generated.stamp
+ephy-shell-search-provider-generated.h : ephy-shell-search-provider-generated.stamp
+
# The upstream for the DBus interface definition is
# at http://git.gnome.org/browse/gnome-shell/plain/data/org.gnome.ShellSearchProvider2.xml
ephy-shell-search-provider-generated.stamp : Makefile.am $(srcdir)/org.gnome.ShellSearchProvider2.xml
@@ -58,8 +59,8 @@ ephy-shell-search-provider-generated.stamp : Makefile.am $(srcdir)/org.gnome.She
--interface-prefix org.gnome. \
--c-namespace Ephy \
--generate-c-code ephy-shell-search-provider-generated \
- $(srcdir)/org.gnome.ShellSearchProvider2.xml
- touch ephy-shell-search-provider-generated.stamp > /dev/null
+ $(srcdir)/org.gnome.ShellSearchProvider2.xml \
+ && touch ephy-shell-search-provider-generated.stamp
CLEANFILES = $(BUILT_SOURCES)