Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Tue, 31 Jul 2012 17:26:27 +0100 |
| 4 | Subject: [PATCH] build: Fix parallel build problems with enum generation |
| 5 | |
| 6 | This is a backport from a patch against master. |
| 7 | |
| 8 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=680925] |
| 9 | --- |
| 10 | extensions/file_tools/Makefile.am | 10 ++++------ |
| 11 | extensions/importer/Makefile.am | 10 ++++------ |
| 12 | extensions/pixbuf_savers/Makefile.am | 10 ++++------ |
| 13 | gthumb/Makefile.am | 10 ++++------ |
| 14 | 4 files changed, 16 insertions(+), 24 deletions(-) |
| 15 | |
| 16 | diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am |
| 17 | index 7785eff..d70a8a5 100644 |
| 18 | --- a/extensions/file_tools/Makefile.am |
| 19 | +++ b/extensions/file_tools/Makefile.am |
| 20 | @@ -24,17 +24,16 @@ HEADER_FILES = \ |
| 21 | gth-file-tool-undo.h \ |
| 22 | preferences.h |
| 23 | |
| 24 | -enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) |
| 25 | +enum-types.h: $(HEADER_FILES) |
| 26 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ |
| 27 | --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ |
| 28 | --fprod "/* enumerations from \"@filename@\" */\n" \ |
| 29 | --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ |
| 30 | --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ |
| 31 | $^> xgen-$(@F) \ |
| 32 | - && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ |
| 33 | - && rm -f xgen-$(@F) ) |
| 34 | + && mv -f xgen-$(@F) enum-types.h ) |
| 35 | |
| 36 | -enum-types.c: $(HEADER_FILES) enum-types.h |
| 37 | +enum-types.c: $(HEADER_FILES) |
| 38 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ |
| 39 | --fhead "#include <glib-object.h>\n" \ |
| 40 | --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ |
| 41 | @@ -42,8 +41,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h |
| 42 | --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ |
| 43 | --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ |
| 44 | $^> xgen-$(@F) \ |
| 45 | - && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ |
| 46 | - && rm -f xgen-$(@F) ) |
| 47 | + && mv -f xgen-$(@F) enum-types.c ) |
| 48 | |
| 49 | libfile_tools_la_SOURCES = \ |
| 50 | $(ENUM_TYPES) \ |
| 51 | diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am |
| 52 | index 29e7f2c..07c1eba 100644 |
| 53 | --- a/extensions/importer/Makefile.am |
| 54 | +++ b/extensions/importer/Makefile.am |
| 55 | @@ -14,17 +14,16 @@ HEADER_FILES = \ |
| 56 | preferences.h \ |
| 57 | utils.h |
| 58 | |
| 59 | -gth-import-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) |
| 60 | +gth-import-enum-types.h: $(HEADER_FILES) |
| 61 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ |
| 62 | --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ |
| 63 | --fprod "/* enumerations from \"@filename@\" */\n" \ |
| 64 | --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ |
| 65 | --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ |
| 66 | $^> xgen-$(@F) \ |
| 67 | - && (cmp -s xgen-$(@F) gth-import-enum-types.h || cp xgen-$(@F) gth-import-enum-types.h ) \ |
| 68 | - && rm -f xgen-$(@F) ) |
| 69 | + && mv -f xgen-$(@F) gth-import-enum-types.h ) |
| 70 | |
| 71 | -gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h |
| 72 | +gth-import-enum-types.c: $(HEADER_FILES) |
| 73 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ |
| 74 | --fhead "#include <glib-object.h>\n" \ |
| 75 | --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ |
| 76 | @@ -32,8 +31,7 @@ gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h |
| 77 | --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ |
| 78 | --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ |
| 79 | $^> xgen-$(@F) \ |
| 80 | - && (cmp -s xgen-$(@F) gth-import-enum-types.c || cp xgen-$(@F) gth-import-enum-types.c ) \ |
| 81 | - && rm -f xgen-$(@F) ) |
| 82 | + && mv -f xgen-$(@F) gth-import-enum-types.c ) |
| 83 | |
| 84 | libimporter_la_SOURCES = \ |
| 85 | $(ENUM_TYPES) \ |
| 86 | diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am |
| 87 | index bfe9f34..4764c32 100644 |
| 88 | --- a/extensions/pixbuf_savers/Makefile.am |
| 89 | +++ b/extensions/pixbuf_savers/Makefile.am |
| 90 | @@ -10,17 +10,16 @@ ENUM_TYPES = \ |
| 91 | HEADER_FILES = \ |
| 92 | preferences.h |
| 93 | |
| 94 | -enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) |
| 95 | +enum-types.h: $(HEADER_FILES) |
| 96 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ |
| 97 | --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ |
| 98 | --fprod "/* enumerations from \"@filename@\" */\n" \ |
| 99 | --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ |
| 100 | --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ |
| 101 | $^> xgen-$(@F) \ |
| 102 | - && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ |
| 103 | - && rm -f xgen-$(@F) ) |
| 104 | + && mv -f xgen-$(@F) enum-types.h ) |
| 105 | |
| 106 | -enum-types.c: $(HEADER_FILES) enum-types.h |
| 107 | +enum-types.c: $(HEADER_FILES) |
| 108 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ |
| 109 | --fhead "#include <glib-object.h>\n" \ |
| 110 | --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ |
| 111 | @@ -28,8 +27,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h |
| 112 | --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ |
| 113 | --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ |
| 114 | $^> xgen-$(@F) \ |
| 115 | - && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ |
| 116 | - && rm -f xgen-$(@F) ) |
| 117 | + && mv -f xgen-$(@F) enum-types.c ) |
| 118 | |
| 119 | libpixbuf_savers_la_SOURCES = \ |
| 120 | $(ENUM_TYPES) \ |
| 121 | diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am |
| 122 | index e9e385e..2f14e03 100644 |
| 123 | --- a/gthumb/Makefile.am |
| 124 | +++ b/gthumb/Makefile.am |
| 125 | @@ -296,17 +296,16 @@ gthumb_CFLAGS = \ |
| 126 | -DGTHUMB_EXTENSIONS_DIR=\"$(extensions_dir)\" \ |
| 127 | $(NULL) |
| 128 | |
| 129 | -gth-enum-types.h: $(PUBLIC_HEADER_FILES) $(GLIB_MKENUMS) |
| 130 | +gth-enum-types.h: $(PUBLIC_HEADER_FILES) |
| 131 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ |
| 132 | --fhead "#ifndef GTH_ENUM_TYPES_H\n#define GTH_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ |
| 133 | --fprod "/* enumerations from \"@filename@\" */\n" \ |
| 134 | --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ |
| 135 | --ftail "G_END_DECLS\n\n#endif /* GTH_ENUM_TYPES_H */" \ |
| 136 | $^> xgen-$(@F) \ |
| 137 | - && (cmp -s xgen-$(@F) gth-enum-types.h || cp xgen-$(@F) gth-enum-types.h ) \ |
| 138 | - && rm -f xgen-$(@F) ) |
| 139 | + && mv -f xgen-$(@F) gth-enum-types.h ) |
| 140 | |
| 141 | -gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h |
| 142 | +gth-enum-types.c: $(PUBLIC_HEADER_FILES) |
| 143 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ |
| 144 | --fhead "#include <glib-object.h>\n" \ |
| 145 | --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ |
| 146 | @@ -314,8 +313,7 @@ gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h |
| 147 | --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ |
| 148 | --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ |
| 149 | $^> xgen-$(@F) \ |
| 150 | - && (cmp -s xgen-$(@F) gth-enum-types.c || cp xgen-$(@F) gth-enum-types.c ) \ |
| 151 | - && rm -f xgen-$(@F) ) |
| 152 | + && mv -f xgen-$(@F) gth-enum-types.c ) |
| 153 | |
| 154 | gth-marshal.h: gth-marshal.list $(GLIB_GENMARSHAL) |
| 155 | $(AM_V_GEN)( $(GLIB_GENMARSHAL) $(srcdir)/gth-marshal.list --header --prefix=gth_marshal > $@ ) |
| 156 | -- |
| 157 | 1.7.10.4 |
| 158 | |