tracker r1473 - branches/indexer-split/src/trackerd

[mbiebl svn gnome org]

Author: mbiebl
Date: Fri May 23 14:41:54 2008
New Revision: 1473
URL: http://svn.gnome.org/viewvc/tracker?rev=1473&view=rev

Log:
Simplify and fix the generation of the marshalling code

- Use $< and $@ so it builds for $srcdir != $builddir
- Don't cmp&cp the generated files around. make will ensure that the source
  files are only (re)generated when tracker-marshal.list has changed.


Modified:
   branches/indexer-split/src/trackerd/Makefile.am

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Fri May 23 14:41:54 2008
@@ -169,14 +169,10 @@
 	$(trackerd_win_libs)
 
 tracker-marshal.h: tracker-marshal.list
-	($(GLIB_GENMARSHAL) --prefix=tracker_marshal tracker-marshal.list --header) > xgen-gmh \
-	&& (cmp -s xgen-gmh tracker-marshal.h || cp xgen-gmh tracker-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
+	$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
 
 tracker-marshal.c: tracker-marshal.list
-	($(GLIB_GENMARSHAL) --prefix=tracker_marshal tracker-marshal.list --body) > xgen-gmc \
-	&& cp xgen-gmc tracker-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
+	$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body > $@
 
 tracker-marshal-main.c: tracker-marshal.c tracker-marshal.h