From 305eb3e23d16b8df2801b5c736b42bb48fed3137 Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 12 Oct 2007 09:02:48 +0000 Subject: [PATCH] Allow java to compile in VPATH settings (at the price of a GNUism in the makefile) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4818 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/Makefile.am | 8 +++++--- src/Makefile.in | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2eee700504..806125ab1e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -350,10 +350,12 @@ clean-local: jardir = $(prefix)/jar jar_DATA = simgrid.jar -simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd +simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd [ -e .classes ] || mkdir .classes - $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) - $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd; + $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file)) + [ -e .classes/surf ] || mkdir .classes/surf + cp $(srcdir)/surf/surfxml.dtd .classes/surf + $(JAR) cvf simgrid.jar -C .classes . else EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) endif diff --git a/src/Makefile.in b/src/Makefile.in index 701da54653..16b0b07aeb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -2280,10 +2280,12 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @HAVE_JAVA_TRUE@clean-local: @HAVE_JAVA_TRUE@ -rm -rf .classes -@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd +@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd @HAVE_JAVA_TRUE@ [ -e .classes ] || mkdir .classes -@HAVE_JAVA_TRUE@ $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) -@HAVE_JAVA_TRUE@ $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd; +@HAVE_JAVA_TRUE@ $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file)) +@HAVE_JAVA_TRUE@ [ -e .classes/surf ] || mkdir .classes/surf +@HAVE_JAVA_TRUE@ cp $(srcdir)/surf/surfxml.dtd .classes +@HAVE_JAVA_TRUE@ $(JAR) cvf simgrid.jar -C .classes . @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/cunit_unit.c: xbt/cunit.c @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ @top_srcdir@/tools/sg_unit_extractor.pl $^ -- 2.20.1