diff options
| author | Ted Gould <ted@gould.cx> | 2008-11-21 05:24:08 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-11-21 05:24:08 +0000 |
| commit | 44a3a78fb6a3863c0c7f3c1193837337e68a67e4 (patch) | |
| tree | 1722ee5ec6f88c881cd4124923354b3c1311501b /src/helper/Makefile_insert | |
| parent | Merge from trunk (diff) | |
| download | inkscape-44a3a78fb6a3863c0c7f3c1193837337e68a67e4.tar.gz inkscape-44a3a78fb6a3863c0c7f3c1193837337e68a67e4.zip | |
Merge from fe-moved
(bzr r6891)
Diffstat (limited to 'src/helper/Makefile_insert')
| -rw-r--r-- | src/helper/Makefile_insert | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/helper/Makefile_insert b/src/helper/Makefile_insert index 4d1ed6630..195ca2632 100644 --- a/src/helper/Makefile_insert +++ b/src/helper/Makefile_insert @@ -40,17 +40,21 @@ helper_libspchelp_a_SOURCES = \ helper/stock-items.cpp \ helper/stock-items.h - -# TODO: Check that the generated sp-marshal.h is the same as before. +# cmp exits with status 0 when there are no differences. if executes the commands +# after "then" when the exit status of the if command is 0 (this is crazy). helper/sp-marshal.h: helper/sp-marshal.list - glib-genmarshal --prefix=sp_marshal --header $(srcdir)/helper/sp-marshal.list > helper/tmp.$$$$ \ - && mv helper/tmp.$$$$ helper/sp-marshal.h + glib-genmarshal --prefix=sp_marshal --header $(srcdir)/helper/sp-marshal.list > helper/tmp.sp-marshal.h + if cmp -s helper/sp-marshal.h helper/tmp.sp-marshal.h; \ + then rm helper/tmp.sp-marshal.h; \ + else mv helper/tmp.sp-marshal.h helper/sp-marshal.h; fi helper/sp-marshal.cpp: helper/sp-marshal.list helper/sp-marshal.h ( echo '#include "helper/sp-marshal.h"' && \ glib-genmarshal --prefix=sp_marshal --body $(srcdir)/helper/sp-marshal.list ) \ - > helper/tmp.$$$$ \ - && mv helper/tmp.$$$$ helper/sp-marshal.cpp + > helper/tmp.sp-marshal.cpp; \ + if cmp -s helper/sp-marshal.cpp helper/tmp.sp-marshal.cpp; \ + then rm helper/tmp.sp-marshal.cpp; \ + else mv helper/tmp.sp-marshal.cpp helper/sp-marshal.cpp; fi helper/sp-marshal.cpp helper/sp-marshal.h: Makefile |