Allow java to compile in VPATH settings (at the price of a GNUism in the makefile)

[simgrid.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 720535d..16b0b07 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -95,13 +95,13 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libgras_la_LIBADD =
-am__objects_1 = snprintf.lo xbt_str.lo ex.lo xbt_virtu.lo \
-       xbt_os_time.lo asserts.lo log.lo xbt_log_appender_file.lo \
-       xbt_log_layout_simple.lo xbt_log_layout_format.lo \
-       mallocator.lo dynar.lo dict.lo dict_elm.lo dict_cursor.lo \
-       dict_multi.lo heap.lo fifo.lo swag.lo graph.lo set.lo \
-       xbt_matrix.lo xbt_queue.lo xbt_peer.lo xbt_main.lo config.lo \
-       cunit.lo graphxml_parse.lo
+am__objects_1 = snprintf.lo xbt_str.lo xbt_strbuff.lo ex.lo \
+       xbt_virtu.lo xbt_os_time.lo asserts.lo log.lo \
+       xbt_log_appender_file.lo xbt_log_layout_simple.lo \
+       xbt_log_layout_format.lo mallocator.lo dynar.lo dict.lo \
+       dict_elm.lo dict_cursor.lo dict_multi.lo heap.lo fifo.lo \
+       swag.lo graph.lo set.lo xbt_matrix.lo xbt_queue.lo xbt_peer.lo \
+       xbt_main.lo config.lo cunit.lo graphxml_parse.lo
 am__objects_2 = gras.lo transport.lo gras_msg_mod.lo gras_msg_types.lo \
        gras_msg_exchange.lo gras_msg_listener.lo rpc.lo timer.lo \
        process.lo gras_module.lo ddt_create.lo ddt_convert.lo \
@@ -120,9 +120,9 @@ libgras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libgras_la_LDFLAGS) $(LDFLAGS) -o $@
 libsimgrid_la_LIBADD =
-am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.c \
-       xbt_modinter.h gras_modinter.h xbt/xbt_virtu.c \
-       xbt/xbt_os_time.c xbt/asserts.c xbt/log.c \
+am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
+       xbt/xbt_strbuff.c xbt/ex.c xbt_modinter.h gras_modinter.h \
+       xbt/xbt_virtu.c xbt/xbt_os_time.c xbt/asserts.c xbt/log.c \
        xbt/xbt_log_appender_file.c xbt/xbt_log_layout_simple.c \
        xbt/xbt_log_layout_format.c xbt/mallocator.c xbt/dynar.c \
        xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c xbt/dict_multi.c \
@@ -190,8 +190,8 @@ libsimgrid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(CXXFLAGS) $(libsimgrid_la_LDFLAGS) $(LDFLAGS) -o $@
 libsimgrid4java_la_LIBADD =
 am__libsimgrid4java_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
-       xbt/ex.c xbt_modinter.h gras_modinter.h xbt/xbt_virtu.c \
-       xbt/xbt_os_time.c xbt/asserts.c xbt/log.c \
+       xbt/xbt_strbuff.c xbt/ex.c xbt_modinter.h gras_modinter.h \
+       xbt/xbt_virtu.c xbt/xbt_os_time.c xbt/asserts.c xbt/log.c \
        xbt/xbt_log_appender_file.c xbt/xbt_log_layout_simple.c \
        xbt/xbt_log_layout_format.c xbt/mallocator.c xbt/dynar.c \
        xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c xbt/dict_multi.c \
@@ -507,7 +507,7 @@ VERSION_INFO = -version-info 2:0:0
 ################################################
 XBT_SRC = \
   \
-  xbt/snprintf.c    xbt/xbt_str.c                                            \
+  xbt/snprintf.c    xbt/xbt_str.c xbt/xbt_strbuff.c                          \
   xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
@@ -956,6 +956,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str_unit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_strbuff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_virtu.Plo@am__quote@
 
 .c.o:
@@ -993,6 +994,13 @@ xbt_str.lo: xbt/xbt_str.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str.lo `test -f 'xbt/xbt_str.c' || echo '$(srcdir)/'`xbt/xbt_str.c
 
+xbt_strbuff.lo: xbt/xbt_strbuff.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_strbuff.lo -MD -MP -MF $(DEPDIR)/xbt_strbuff.Tpo -c -o xbt_strbuff.lo `test -f 'xbt/xbt_strbuff.c' || echo '$(srcdir)/'`xbt/xbt_strbuff.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_strbuff.Tpo $(DEPDIR)/xbt_strbuff.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_strbuff.c' object='xbt_strbuff.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_strbuff.lo `test -f 'xbt/xbt_strbuff.c' || echo '$(srcdir)/'`xbt/xbt_strbuff.c
+
 ex.lo: xbt/ex.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex.lo -MD -MP -MF $(DEPDIR)/ex.Tpo -c -o ex.lo `test -f 'xbt/ex.c' || echo '$(srcdir)/'`xbt/ex.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/ex.Tpo $(DEPDIR)/ex.Plo
@@ -2272,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 $^