X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6ce3162b34f0a964b8844368b9d86df4f1cf89b..7c201c0d1c86281bb94969e4d3ee23972d2e0275:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 4d170b9eb2..18e0116841 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -50,11 +50,16 @@ target_triplet = @target@ @CONTEXT_THREADS_FALSE@am__append_2 = xbt/xbt_os_thread_stubs.c @HAVE_GTNETS_FALSE@am__append_3 = $(GTNETS_SRC) @HAVE_SDP_FALSE@am__append_4 = surf/sdp.c -@HAVE_JAVA_TRUE@am__append_5 = libsimgrid4java.la -@HAVE_JAVA_FALSE@am__append_6 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) + +# Windows users (at least, MSVC ones) need a def file. +@IS_WINDOWS_TRUE@am__append_5 = -Wl,--output-def,libgras.def +@IS_WINDOWS_TRUE@am__append_6 = -Wl,--output-def,libsimgrid.def +@IS_WINDOWS_TRUE@am__append_7 = -Wl,--output-def,libsmpi.def +@HAVE_JAVA_TRUE@am__append_8 = libsimgrid4java.la +@HAVE_JAVA_FALSE@am__append_9 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) @GRAMINE_MODE_FALSE@noinst_PROGRAMS = testall$(EXEEXT) @GRAMINE_MODE_FALSE@TESTS = testall$(EXEEXT) -@GRAMINE_MODE_FALSE@am__append_7 = $(testall_SOURCES) +@GRAMINE_MODE_FALSE@am__append_10 = $(testall_SOURCES) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/gras_config.h.in $(srcdir)/ucontext_stack.h.in \ $(top_srcdir)/acmacro/dist-files.mk @@ -364,7 +369,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTH_STACK_GROWTH = @PTH_STACK_GROWTH@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIMGRID_DEP = @SIMGRID_DEP@ @@ -442,15 +446,18 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \ surf/cpu_private.h surf/workstation_private.h \ surf/surf_timer_private.h surf/surfxml_parse.c surf/surfxml.l \ surf/surfxml.c surf/surfxml.dtd surf/network_private.h \ - network_gtnets_private.h surf/workstation_KCCFLN05_private.h \ - include/surf/maxmin.h include/surf/trace_mgr.h \ - include/surf/surf.h include/surf/surfxml_parse_private.h \ - include/xbt/xbt_os_time.h include/xbt/xbt_os_thread.h \ - include/xbt/context.h msg/private.h simdag/private.h \ - gras/DataDesc/ddt_parse.yy.l gras/Virtu/virtu_interface.h \ + surf/network_gtnets_private.h include/surf/maxmin.h \ + include/surf/trace_mgr.h include/surf/surf.h \ + include/surf/surfxml_parse_private.h include/xbt/xbt_os_time.h \ + include/xbt/xbt_os_thread.h include/xbt/context.h \ + msg/private.h simdag/private.h gras/DataDesc/ddt_parse.yy.l \ + gras/Virtu/virtu_rl.h gras/Virtu/virtu_sg.h \ + gras/Virtu/virtu_interface.h gras/Virtu/virtu_private.h \ + gras/Transport/transport_interface.h \ amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \ - $(am__append_3) $(am__append_4) $(am__append_6) \ - $(am__append_7) + include/simix/simix.h include/simix/datatypes.h \ + simix/private.h smpi/private.h $(am__append_3) $(am__append_4) \ + $(JMSG_JAVA_SRC) $(am__append_9) $(am__append_10) #LIBRARY_VERSION= 0:0:0 # | | | @@ -588,12 +595,15 @@ JMSG_JAVA_SRC = \ java/simgrid/msg/ProcessNotFoundException.java \ \ java/simgrid/msg/Process.java \ + java/simgrid/msg/DTDResolver.java \ java/simgrid/msg/ApplicationHandler.java \ java/simgrid/msg/Channel.java \ java/simgrid/msg/Host.java \ java/simgrid/msg/Msg.java \ java/simgrid/msg/Task.java \ - java/simgrid/msg/ParallelTask.java + java/simgrid/msg/ParallelTask.java \ + \ + java/simgrid/msg/Sem.java SIMDAG_SRC = simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c GRAS_COMMON_SRC = \ @@ -639,22 +649,25 @@ AMOK_SRC = \ ### ### Declare the library content ### -lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_5) +lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_8) libgras_la_SOURCES = $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC) -libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ \ + @LD_DYNAMIC_FLAGS@ -lm $(am__append_5) libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(SIMIX_SRC) $(CTX_SRC) \ $(MSG_SRC) $(SIMDAG_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) -libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ \ + @LD_DYNAMIC_FLAGS@ -lm $(am__append_6) # Please do not add -no-undefined to libsmpi_la_LDFLAGS: # smpi_simulated_main is indeed defined in user code, and undef in the # library (no idea why it works under linux, but it fails under windows) libsmpi_la_LIBADD = libsimgrid.la libsmpi_la_SOURCES = $(SMPI_SRC) -libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \ + $(am__append_7) @HAVE_JAVA_TRUE@libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ @HAVE_JAVA_TRUE@ $(SIMIX_SRC) $(JCTX_SRC) \ @HAVE_JAVA_TRUE@ $(JMSG_C_SRC) $(MSG_SRC) \ @@ -674,7 +687,6 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm @GRAMINE_MODE_FALSE@ @builddir@/xbt_str_unit.c \ @GRAMINE_MODE_FALSE@ @builddir@/config_unit.c -@GRAMINE_MODE_FALSE@CLEANFILES = $(TEST_UNITS) @GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/surfxml.h surf/surfxml.c \ @GRAMINE_MODE_FALSE@ ../include/xbt/graphxml.h xbt/graphxml.c \ @GRAMINE_MODE_FALSE@ gras/DataDesc/ddt_parse.yy.c \ @@ -683,6 +695,7 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm @GRAMINE_MODE_FALSE@testall_SOURCES = $(TEST_UNITS) @builddir@/simgrid_units_main.c @GRAMINE_MODE_FALSE@testall_LDADD = libgras.la @GRAMINE_MODE_FALSE@TESTS_ENVIRONMENT = $(SG_TEST_EXENV) +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@CLEANFILES = $(TEST_UNITS) all: $(BUILT_SOURCES) gras_config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -2249,19 +2262,14 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ uninstall-am uninstall-binSCRIPTS uninstall-jarDATA \ uninstall-libLTLIBRARIES - \ - include/simix/simix.h include/simix/datatypes.h \ - simix/msg_simix_private.h \ - \ - smpi/private.h @HAVE_JAVA_TRUE@clean-local: @HAVE_JAVA_TRUE@ -rm -rf .classes -@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) +@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) ./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 .; +@HAVE_JAVA_TRUE@ $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) +@HAVE_JAVA_TRUE@ $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd; @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 $^ @@ -2291,11 +2299,14 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ rm -vf $$dep @srcdir@/$$dep; touch $$dep; \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ done -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: Test units not generated." -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag" -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @exit 1 +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "WARNING: Test units not generated, but touched instead since this is a bot build." +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ touch $@ +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: Test units not generated." +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag" +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @exit 1 ### ### Regenerate what needs to with flex & flexml @@ -2306,8 +2317,10 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@surf/surfxml.c: surf/surfxml.l @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^ +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ sed 's/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include \n# include \n# endif\n#else\n# include \n#endif/g' -i $@ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@xbt/graphxml.c: xbt/graphxml.l @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^ +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ sed 's/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include \n# include \n# endif\n#else\n# include \n#endif/g' -i $@ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@surf/surfxml.l: $(srcdir)/surf/surfxml.dtd @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^