diff options
| author | Ross Burton <ross@linux.intel.com> | 2010-06-10 11:36:13 +0100 |
|---|---|---|
| committer | Ross Burton <ross@linux.intel.com> | 2010-06-10 11:36:13 +0100 |
| commit | 3652e1f37e82b8e63983e30fda3482cd099a8cf5 (patch) | |
| tree | 22700ccbbc146659c300eab7936058e9784c405a | |
| parent | 2fe3fb169a2fe43251f0734c06f026954bd7ead7 (diff) | |
Don't use stamps when generating files0.8
| -rw-r--r-- | gypsy/Makefile.am | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 20 |
2 files changed, 7 insertions, 22 deletions
diff --git a/gypsy/Makefile.am b/gypsy/Makefile.am index 38741f5..4ce9083 100644 --- a/gypsy/Makefile.am +++ b/gypsy/Makefile.am @@ -41,13 +41,8 @@ libgypsy_include_HEADERS = \ EXTRA_DIST = gypsy-marshal.list CLEANFILES = $(BUILT_SOURCES) -%-bindings.h: stamp-%-bindings.h - @true -stamp-%-bindings.h: ../interfaces/%.xml - $(AM_V_GEN)$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=gypsy $< > xgen-$(@F) \ - && (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \ - && rm -f xgen-$(@F) \ - && echo timestamp > $(@F) +%-bindings.h: ../interfaces/%.xml + $(AM_V_GEN)$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=gypsy $< > $@ gypsy-marshal.h: $(srcdir)/gypsy-marshal.list $(GLIB_GENMARSHAL) $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@ diff --git a/src/Makefile.am b/src/Makefile.am index 47bb38d..1c2e6ac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,9 +40,7 @@ BUILT_SOURCES = \ EXTRA_DIST = gypsy-marshal.list \ $(BUILT_SOURCES) -CLEANFILES = $(BUILT_SOURCES) \ - stamp-gypsy-client-glue.h \ - stamp-gypsy-server-glue.h +CLEANFILES = $(BUILT_SOURCES) gypsy-marshal-internal.h: gypsy-marshal.list $(GLIB_GENMARSHAL) $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@ @@ -50,16 +48,8 @@ gypsy-marshal-internal.c: gypsy-marshal.list gypsy-marshal-internal.h $(GLIB_GEN $(AM_V_GEN)echo "#include \"gypsy-marshal-internal.h\"" > $@ \ && $(GLIB_GENMARSHAL) --prefix=gypsy_marshal $(srcdir)/gypsy-marshal.list --body >> $@ -%-glue.h: stamp-%-glue.h - @true -stamp-gypsy-server-glue.h: ../interfaces/gypsy-server.xml - $(AM_V_GEN)$(DBUS_BINDING_TOOL) --prefix=gypsy_server --mode=glib-server $< > xgen-$(@F) \ - && (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \ - && rm -f xgen-$(@F) \ - && echo timestamp > $(@F) +gypsy-server-glue.h: ../interfaces/gypsy-server.xml + $(AM_V_GEN)$(DBUS_BINDING_TOOL) --prefix=gypsy_server --mode=glib-server $< > $@ -stamp-gypsy-client-glue.h: ../interfaces/gypsy-client.xml - $(AM_V_GEN)$(DBUS_BINDING_TOOL) --prefix=gypsy_client --mode=glib-server $< > xgen-$(@F) \ - && (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \ - && rm -f xgen-$(@F) \ - && echo timestamp > $(@F) +gypsy-client-glue.h: ../interfaces/gypsy-client.xml + $(AM_V_GEN)$(DBUS_BINDING_TOOL) --prefix=gypsy_client --mode=glib-server $< > $@ |