[file-roller] fixed dependencies for the enum types and the embedded resources

[Paolo Bacchilega <paobac src gnome org>]

commit 00697690cf822f0d48efc26d53290137da4dcd28
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Aug 10 12:16:51 2012 +0200

    fixed dependencies for the enum types and the embedded resources

 src/Makefile.am |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 30bf764..732f07e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -175,24 +175,23 @@ COMMON_SOURCES +=			\
 	fr-archive-libarchive.c
 endif
 
-fr-marshal.h: fr-marshal.list $(GLIB_GENMARSHAL)
+fr-marshal.h: fr-marshal.list 
 	$(AM_V_GEN)( $(GLIB_GENMARSHAL) $< --header --prefix=fr_marshal > $@ )
 
 fr-marshal.c: fr-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN)( echo "#include \"fr-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=fr_marshal >> $@ )
 
-fr-enum-types.h: typedefs.h $(GLIB_MKENUMS)
+fr-enum-types.h: typedefs.h 
 	$(AM_V_GEN)( $(GLIB_MKENUMS) \
 		--fhead "#ifndef FR_ENUM__TYPES_H\n#define FR_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 		--fprod "/* enumerations from \"@filename \" */\n" \
 		--vhead "GType @enum_name _get_type (void);\n#define FR_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" \
 		--ftail "G_END_DECLS\n\n#endif /* FR_ENUM_TYPES_H */" \
 		$^> xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) fr-enum-types.h || cp xgen-$(@F) fr-enum-types.h ) \
-	&& rm -f xgen-$(@F) )
-
-fr-enum-types.c: typedefs.h fr-enum-types.h
+	&& mv -f xgen-$(@F) fr-enum-types.h )
+	
+fr-enum-types.c: typedefs.h
 	$(AM_V_GEN)( $(GLIB_MKENUMS) \
 		--fhead "#include <glib-object.h>\n#include \"fr-enum-types.h\"\n" \
 		--fprod "\n/* enumerations from \"@filename \" */\n#include \"@filename \"" \
@@ -200,13 +199,14 @@ fr-enum-types.c: typedefs.h fr-enum-types.h
 		--vprod "      { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
 		--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ type@_register_static (\"@EnumName \", values);\n  }\n  return etype;\n}\n" \
 		$^> xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) fr-enum-types.c || cp xgen-$(@F) fr-enum-types.c ) \
-	&& rm -f xgen-$(@F) )
+	&& mv -f xgen-$(@F) fr-enum-types.c )
+
+RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies file-roller.gresource.xml)
 
-fr-resources.c: file-roller.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies file-roller.gresource.xml)
+fr-resources.c: file-roller.gresource.xml $(RESOURCES)
 	$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fr $(srcdir)/file-roller.gresource.xml
 
-fr-resources.h: file-roller.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies file-roller.gresource.xml)
+fr-resources.h: file-roller.gresource.xml $(RESOURCES)
 	$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fr $(srcdir)/file-roller.gresource.xml
 
 file_roller_SOURCES = 			\