diff options
Diffstat (limited to 'meta/packages/eds/eds-dbus/parallelmake.patch')
| -rw-r--r-- | meta/packages/eds/eds-dbus/parallelmake.patch | 201 |
1 files changed, 0 insertions, 201 deletions
diff --git a/meta/packages/eds/eds-dbus/parallelmake.patch b/meta/packages/eds/eds-dbus/parallelmake.patch deleted file mode 100644 index 08cfac0d83..0000000000 --- a/meta/packages/eds/eds-dbus/parallelmake.patch +++ /dev/null | |||
| @@ -1,201 +0,0 @@ | |||
| 1 | Update git.mk to the version from Pango which has parallel make fixes. | ||
| 2 | http://git.gnome.org/browse/pango/log/git.mk | ||
| 3 | commit 6118d5891fee776a087855c335a73c79fdaf036c | ||
| 4 | |||
| 5 | RP 16/3/10 | ||
| 6 | |||
| 7 | Index: git/git.mk | ||
| 8 | =================================================================== | ||
| 9 | --- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000 | ||
| 10 | +++ git/git.mk 2010-03-16 11:30:23.000000000 +0000 | ||
| 11 | @@ -82,97 +82,106 @@ | ||
| 12 | ### .gitignore generation | ||
| 13 | |||
| 14 | $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk | ||
| 15 | - @echo Generating $@; \ | ||
| 16 | - GTKDOCGITIGNOREFILES=; \ | ||
| 17 | - test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \ | ||
| 18 | - GTKDOCGITIGNOREFILES=" \ | ||
| 19 | - $(DOC_MODULE)-decl-list.txt \ | ||
| 20 | - $(DOC_MODULE)-decl.txt \ | ||
| 21 | - tmpl/$(DOC_MODULE)-unused.sgml \ | ||
| 22 | - tmpl/*.bak \ | ||
| 23 | - xml html \ | ||
| 24 | - "; \ | ||
| 25 | - GNOMEDOCUTILSGITIGNOREFILES=; \ | ||
| 26 | - test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \ | ||
| 27 | - GNOMEDOCUTILSGITIGNOREFILES=" \ | ||
| 28 | - $(_DOC_C_DOCS) \ | ||
| 29 | - $(_DOC_LC_DOCS) \ | ||
| 30 | - $(_DOC_OMF_ALL) \ | ||
| 31 | - $(_DOC_DSK_ALL) \ | ||
| 32 | - $(_DOC_HTML_ALL) \ | ||
| 33 | - $(_DOC_POFILES) \ | ||
| 34 | - */.xml2po.mo \ | ||
| 35 | - */*.omf.out \ | ||
| 36 | - "; \ | ||
| 37 | - INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \ | ||
| 38 | - INTLTOOLGITIGNOREFILES=" \ | ||
| 39 | - po/Makefile.in.in \ | ||
| 40 | - po/Makefile.in \ | ||
| 41 | - po/Makefile \ | ||
| 42 | - po/*.gmo \ | ||
| 43 | - po/*.mo \ | ||
| 44 | - po/POTFILES \ | ||
| 45 | - po/stamp-it \ | ||
| 46 | - po/.intltool-merge-cache \ | ||
| 47 | - intltool-extract.in \ | ||
| 48 | - intltool-merge.in \ | ||
| 49 | - intltool-update.in \ | ||
| 50 | - "; \ | ||
| 51 | - AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \ | ||
| 52 | - AUTOCONFGITIGNOREFILES=" \ | ||
| 53 | - autom4te.cache \ | ||
| 54 | - configure \ | ||
| 55 | - config.h \ | ||
| 56 | - stamp-h1 \ | ||
| 57 | - libtool \ | ||
| 58 | - config.lt \ | ||
| 59 | - "; \ | ||
| 60 | - for x in \ | ||
| 61 | - .gitignore \ | ||
| 62 | - $$GTKDOCGITIGNOREFILES \ | ||
| 63 | - $$GNOMEDOCUTILSGITIGNOREFILES \ | ||
| 64 | - $$INTLTOOLGITIGNOREFILES \ | ||
| 65 | - $$AUTOCONFGITIGNOREFILES \ | ||
| 66 | - $(GITIGNOREFILES) \ | ||
| 67 | - $(CLEANFILES) \ | ||
| 68 | - $(PROGRAMS) \ | ||
| 69 | - $(EXTRA_PROGRAMS) \ | ||
| 70 | - $(LTLIBRARIES) \ | ||
| 71 | - so_locations \ | ||
| 72 | - .libs _libs \ | ||
| 73 | - $(MOSTLYCLEANFILES) \ | ||
| 74 | - "*.$(OBJEXT)" \ | ||
| 75 | - "*.lo" \ | ||
| 76 | - $(DISTCLEANFILES) \ | ||
| 77 | - $(am__CONFIG_DISTCLEAN_FILES) \ | ||
| 78 | - $(CONFIG_CLEAN_FILES) \ | ||
| 79 | - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ | ||
| 80 | - "*.tab.c" \ | ||
| 81 | - $(MAINTAINERCLEANFILES) \ | ||
| 82 | - $(BUILT_SOURCES) \ | ||
| 83 | - $(DEPDIR) \ | ||
| 84 | - Makefile \ | ||
| 85 | - Makefile.in \ | ||
| 86 | - "*.orig" \ | ||
| 87 | - "*.rej" \ | ||
| 88 | - "*.bak" \ | ||
| 89 | - "*~" \ | ||
| 90 | - ".*.sw[nop]" \ | ||
| 91 | - ; do echo /$$x; done | \ | ||
| 92 | + $(AM_V_GEN) \ | ||
| 93 | + { \ | ||
| 94 | + if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ | ||
| 95 | + for x in \ | ||
| 96 | + $(DOC_MODULE)-decl-list.txt \ | ||
| 97 | + $(DOC_MODULE)-decl.txt \ | ||
| 98 | + tmpl/$(DOC_MODULE)-unused.sgml \ | ||
| 99 | + "tmpl/*.bak" \ | ||
| 100 | + xml html \ | ||
| 101 | + ; do echo /$$x; done; \ | ||
| 102 | + fi; \ | ||
| 103 | + if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ | ||
| 104 | + for x in \ | ||
| 105 | + $(_DOC_C_DOCS) \ | ||
| 106 | + $(_DOC_LC_DOCS) \ | ||
| 107 | + $(_DOC_OMF_ALL) \ | ||
| 108 | + $(_DOC_DSK_ALL) \ | ||
| 109 | + $(_DOC_HTML_ALL) \ | ||
| 110 | + $(_DOC_POFILES) \ | ||
| 111 | + "*/.xml2po.mo" \ | ||
| 112 | + "*/*.omf.out" \ | ||
| 113 | + ; do echo /$$x; done; \ | ||
| 114 | + fi; \ | ||
| 115 | + if test -f $(srcdir)/po/Makefile.in.in; then \ | ||
| 116 | + for x in \ | ||
| 117 | + po/Makefile.in.in \ | ||
| 118 | + po/Makefile.in \ | ||
| 119 | + po/Makefile \ | ||
| 120 | + po/POTFILES \ | ||
| 121 | + po/stamp-it \ | ||
| 122 | + po/.intltool-merge-cache \ | ||
| 123 | + "po/*.gmo" \ | ||
| 124 | + "po/*.mo" \ | ||
| 125 | + po/$(GETTEXT_PACKAGE).pot \ | ||
| 126 | + intltool-extract.in \ | ||
| 127 | + intltool-merge.in \ | ||
| 128 | + intltool-update.in \ | ||
| 129 | + ; do echo /$$x; done; \ | ||
| 130 | + fi; \ | ||
| 131 | + if test -f $(srcdir)/configure; then \ | ||
| 132 | + for x in \ | ||
| 133 | + autom4te.cache \ | ||
| 134 | + configure \ | ||
| 135 | + config.h \ | ||
| 136 | + stamp-h1 \ | ||
| 137 | + libtool \ | ||
| 138 | + config.lt \ | ||
| 139 | + ; do echo /$$x; done; \ | ||
| 140 | + fi; \ | ||
| 141 | + for x in \ | ||
| 142 | + .gitignore \ | ||
| 143 | + $(GITIGNOREFILES) \ | ||
| 144 | + $(CLEANFILES) \ | ||
| 145 | + $(PROGRAMS) \ | ||
| 146 | + $(check_PROGRAMS) \ | ||
| 147 | + $(EXTRA_PROGRAMS) \ | ||
| 148 | + $(LTLIBRARIES) \ | ||
| 149 | + so_locations \ | ||
| 150 | + .libs _libs \ | ||
| 151 | + $(MOSTLYCLEANFILES) \ | ||
| 152 | + "*.$(OBJEXT)" \ | ||
| 153 | + "*.lo" \ | ||
| 154 | + $(DISTCLEANFILES) \ | ||
| 155 | + $(am__CONFIG_DISTCLEAN_FILES) \ | ||
| 156 | + $(CONFIG_CLEAN_FILES) \ | ||
| 157 | + TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ | ||
| 158 | + "*.tab.c" \ | ||
| 159 | + $(MAINTAINERCLEANFILES) \ | ||
| 160 | + $(BUILT_SOURCES) \ | ||
| 161 | + $(DEPDIR) \ | ||
| 162 | + Makefile \ | ||
| 163 | + Makefile.in \ | ||
| 164 | + "*.orig" \ | ||
| 165 | + "*.rej" \ | ||
| 166 | + "*.bak" \ | ||
| 167 | + "*~" \ | ||
| 168 | + ".*.sw[nop]" \ | ||
| 169 | + ; do echo /$$x; done; \ | ||
| 170 | + } | \ | ||
| 171 | sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ | ||
| 172 | sed 's@/[.]/@/@g' | \ | ||
| 173 | - LANG=C sort | uniq > $@.tmp && \ | ||
| 174 | + LC_ALL=C sort | uniq > $@.tmp && \ | ||
| 175 | mv $@.tmp $@; | ||
| 176 | |||
| 177 | -all: $(srcdir)/.gitignore gitignore-recurse | ||
| 178 | -gitignore-recurse: | ||
| 179 | +all: $(srcdir)/.gitignore gitignore-recurse-maybe | ||
| 180 | +gitignore-recurse-maybe: | ||
| 181 | @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \ | ||
| 182 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
| 183 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \ | ||
| 184 | - done; \ | ||
| 185 | + $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \ | ||
| 186 | fi; | ||
| 187 | +gitignore-recurse: | ||
| 188 | + @for subdir in $(DIST_SUBDIRS); do \ | ||
| 189 | + case " $(SUBDIRS) " in \ | ||
| 190 | + *" $$subdir "*) :;; \ | ||
| 191 | + *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \ | ||
| 192 | + esac; \ | ||
| 193 | + done | ||
| 194 | +gitignore: $(srcdir)/.gitignore gitignore-recurse | ||
| 195 | + | ||
| 196 | maintainer-clean: gitignore-clean | ||
| 197 | gitignore-clean: | ||
| 198 | -rm -f $(srcdir)/.gitignore | ||
| 199 | -.PHONY: gitignore-clean gitignore-recurse | ||
| 200 | |||
| 201 | +.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe | ||
