X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/741004618140d8530e002017102214648fe32807..b61fd75d5de007848291c118e37bfe6aa3aa3fa9:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 64391ec993..a1545d4e50 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,6 @@ EXTRA_DIST= \ portable.h \ \ xbt/mallocator_private.h \ - xbt/dynar_private.h \ xbt/dict_private.h \ xbt/heap_private.h \ xbt/fifo_private.h \ @@ -47,6 +46,7 @@ EXTRA_DIST= \ surf/gtnets/gtnets_interface.h \ surf/gtnets/gtnets_simulator.h \ surf/gtnets/gtnets_topology.h \ + surf/cpu_ti_private.h \ \ include/surf/surf_resource.h \ include/surf/datatypes.h \ @@ -65,6 +65,7 @@ EXTRA_DIST= \ msg/mailbox.h \ \ simdag/private.h \ + simdag/dax.dtd \ \ gras/DataDesc/ddt_parse.yy.l \ gras/Virtu/virtu_rl.h \ @@ -152,7 +153,7 @@ XBT_SRC=\ xbt/set.c \ xbt/xbt_matrix.c \ \ - xbt/xbt_queue.c \ + xbt/xbt_queue.c xbt/xbt_synchro.c \ \ xbt/xbt_peer.c \ \ @@ -184,6 +185,8 @@ SURF_SRC= \ surf/cpu.c surf/network.c surf/network_constant.c surf/workstation.c \ surf/surf_model_timer.c \ surf/workstation_ptask_L07.c \ + surf/cpu_ti.c \ + surf/cpu_im.c \ xbt/xbt_sg_stubs.c if CONTEXT_THREADS @@ -196,18 +199,16 @@ GTNETS_SRC= \ surf/gtnets/gtnets_interface.cc \ surf/network_gtnets.c -# Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit() -# so there is an implementation of these functions in the simgrid library and an implementatin in the gras library -CTX_SRC= simix/smx_context.c - SIMIX_SRC= \ simix/smx_global.c \ simix/smx_deployment.c \ simix/smx_environment.c \ simix/smx_host.c \ simix/smx_process.c \ + simix/smx_context.c \ simix/smx_action.c \ - simix/smx_synchro.c + simix/smx_synchro.c \ + simix/smx_network.c if CONTEXT_THREADS SURF_SRC += simix/smx_context_thread.c @@ -260,7 +261,8 @@ JMSG_JAVA_SRC = \ java/simgrid/msg/Sem.java -SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c +SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c \ + simdag/sd_daxloader.c GRAS_COMMON_SRC= \ gras/gras.c \ @@ -328,8 +330,7 @@ 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 libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \ - $(SIMIX_SRC) $(CTX_SRC) \ - $(MSG_SRC) $(SIMDAG_SRC) \ + $(SIMIX_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 # -Wl,--entry -Wl,simgrid_version @@ -357,7 +358,7 @@ if HAVE_JAVA libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library clean-local: - -rm -rf .classes + -rm -rf .classes simgrid.jar jardir = $(prefix)/jar jar_DATA = simgrid.jar @@ -369,7 +370,7 @@ simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd cp $(srcdir)/surf/simgrid.dtd .classes/surf $(JAR) cvf simgrid.jar -C .classes . else -EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC) +EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC) endif if GRAMINE_MODE @@ -390,15 +391,16 @@ else noinst_PROGRAMS=testall TEST_CFILES=xbt/cunit.c xbt/ex.c \ xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \ - xbt/xbt_str.c xbt/xbt_sha.c \ - xbt/config.c + xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c \ + xbt/config.c xbt/xbt_synchro.c TEST_UNITS= @builddir@/cunit_unit.c @builddir@/ex_unit.c \ @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \ @builddir@/xbt_str_unit.c @builddir@/xbt_strbuff_unit.c @builddir@/xbt_sha_unit.c\ - @builddir@/config_unit.c + @builddir@/config_unit.c @builddir@/xbt_synchro_unit.c BUILT_SOURCES=../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \ ../include/xbt/graphxml.h xbt/graphxml.c \ + simdag/dax_dtd.h simdag/dax_dtd.c \ gras/DataDesc/ddt_parse.yy.c \ $(TEST_UNITS) @builddir@/simgrid_units_main.c @@ -412,8 +414,7 @@ EXTRA_DIST+=$(testall_SOURCES) if MAINTAINER_MODE CLEANFILES=$(TEST_UNITS) -$(TEST_UNITS): xbt/cunit.c xbt/ex.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c\ - xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c xbt/config.c +$(TEST_UNITS): $(TEST_CFILES) @top_srcdir@/tools/sg_unit_extractor.pl $^ @builddir@/simgrid_units_main.c: $(TEST_UNITS) @@ -456,6 +457,9 @@ surf/simgrid_dtd.c: surf/simgrid_dtd.l xbt/graphxml.c: xbt/graphxml.l set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^ 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 $@ +simdag/dax_dtd.c: simdag/dax_dtd.l + set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pdax_ --noline $^ + 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 $@ if HAVE_FLEXML surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd @@ -473,6 +477,14 @@ $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd set -e; flexml -P graphxml --sysid=graphxml.dtd -H $@ -L $^ sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ + +simdag/dax_dtd.l: simdag/dax.dtd + set -e; flexml -b 1000000 --root-tags adag -P dax_ --sysid=dax.dtd -S $@ -L $^ + sed -i 's/SET(DOCTYPE)/SET(ROOT_dax__adag)/' simdag/dax_dtd.l # DOCTYPE not mandatory +simdag/dax_dtd.h: simdag/dax.dtd + set -e; flexml --root-tags adag -P dax_ --sysid=dax.dtd -H $@ -L $^ + sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ + sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ else $(top_srcdir)/include/surf/simgrid_dtd.h surf/simgrid_dtd.l: $(top_srcdir)/src/surf/simgrid.dtd @@ -485,6 +497,11 @@ $(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graph @echo "ERROR: Please install it, or if you didn't modify this file, try this:" @echo "ERROR: touch include/xbt/graphxml.h src/xbt/graphxml.l" @exit 1 +simdag/dax_dtd.h simdag/dax_dtd.l: simdag/dax_dtd.dtd + @echo "ERROR: src/simdag/dax.dtd was modified, but the flexml program was not detected" + @echo "ERROR: Please install it, or if you didn't modify this file, try this:" + @echo "ERROR: touch src/simdag/dax_dtd.h src/simdag/dax_dtd.l" + @exit 1 endif endif endif