diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2014-04-20 19:29:29 +0100 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2014-04-20 19:29:29 +0100 |
| commit | 334c9f3174010b114b42065d55aa6c4887d09f3a (patch) | |
| tree | 43e9ea7cbe28621b06d58c3334f7c93741ccf262 | |
| parent | 0116515b19e73f3589092b47dbfe6acbccd811d4 (diff) | |
| download | classpath-334c9f3174010b114b42065d55aa6c4887d09f3a.tar.gz | |
Fix issues with parallel make.
2014-04-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
Fix issues with parallel make.
* lib/Makefile.am:
(.PHONY): Remove genclasses; no longer phony.
(classes): Remove.
(genclasses): Touch genclasses to mark completion.
(gen-xpath-parser): Touch gen-xpath-parser to mark
completion.
(compile-classes): Depend on genclasses directly.
(CLEANFILES): Remove gen-xpath-parser and genclasses.
Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/Makefile.am | 12 |
2 files changed, 17 insertions, 7 deletions
@@ -1,3 +1,15 @@ +2014-04-14 Andrew John Hughes <gnu_andrew@member.fsf.org> + + Fix issues with parallel make. + * lib/Makefile.am: + (.PHONY): Remove genclasses; no longer phony. + (classes): Remove. + (genclasses): Touch genclasses to mark completion. + (gen-xpath-parser): Touch gen-xpath-parser to mark + completion. + (compile-classes): Depend on genclasses directly. + (CLEANFILES): Remove gen-xpath-parser and genclasses. + 2013-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/lang/model/SourceVersion.java: diff --git a/lib/Makefile.am b/lib/Makefile.am index 97a8b6926..df02fad25 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -61,8 +61,6 @@ uninstall-local: endif # INSTALL_CLASS_FILES -.PHONY: genclasses - if USE_PREBUILT_GLIBJ_ZIP glibj.zip: @@ -99,19 +97,19 @@ resources: copy-vmresources.sh done touch resources -classes: genclasses - $(top_builddir)/gnu/java/locale/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh @mkdir_p@ $(top_builddir)/gnu/java/locale $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/gnu/java/locale/LocaleData.java genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/LocaleData.java gen-xpath-parser top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL) ./gen-classlist.sh standard + touch genclasses # Only rebuild parsers when explicitly asked to. if REGEN_PARSERS gen-xpath-parser: $(top_srcdir)/gnu/xml/xpath/XPathParser.java + touch gen-xpath-parser $(top_srcdir)/gnu/xml/xpath/XPathParser.java: $(top_srcdir)/gnu/xml/xpath/XPathParser.y ( cd $(top_srcdir)/gnu/xml/xpath; \ @@ -119,7 +117,7 @@ $(top_srcdir)/gnu/xml/xpath/XPathParser.java: $(top_srcdir)/gnu/xml/xpath/XPathP else gen-xpath-parser: - true + touch gen-xpath-parser endif # REGEN_PARSER @@ -137,13 +135,13 @@ $(JAVA_DEPEND): genclasses # top_srcdir=$(top_srcdir) # touch compile-classes #else -compile-classes: classes $(JAVA_SRCS) Makefile +compile-classes: genclasses $(JAVA_SRCS) Makefile $(JCOMPILER) touch compile-classes #endif EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh glibj.zip -CLEANFILES = compile-classes resources classes \ +CLEANFILES = compile-classes resources classes genclasses gen-xpath-parser \ glibj.zip classes.1 classes.2 Makefile.deps \ $(top_builddir)/gnu/java/locale/LocaleData.java \ $(JAVA_DEPEND) |