X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b470fc7653464e7e6cb440ca449beb41b5c9df1..a56d323b6f5d2d22094df9c0521379dddbd9173a:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 14e3b9ba81..25a45affa4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,10 @@ +# Copyright (c) 2004-2007. The SimGrid team. All right reserved. + +# This file is part of the SimGrid project. This is free software: +# You can redistribute and/or modify it under the terms of the +# GNU LGPL (v2.1) licence. + + #AM_CFLAGS= -DNDEBUG # -DNLOG cuts absolutely all logs at compilation time. @@ -24,7 +31,12 @@ EXTRA_DIST= \ xbt/graphxml.l \ xbt/graphxml.c \ xbt/graphxml.dtd \ - xbt/context_private.h \ + xbt/xbt_context_private.h \ + xbt/xbt_context_factory.h \ + xbt/xbt_thread_context.h \ + xbt/xbt_ucontext.h \ + xbt/xbt_jcontext.h \ + xbt/log_private.h \ xbt/ex_interface.h \ \ surf/maxmin_private.h \ @@ -38,7 +50,7 @@ EXTRA_DIST= \ surf/surfxml.c \ surf/surfxml.dtd \ surf/network_private.h \ - network_gtnets_private.h \ + surf/network_gtnets_private.h \ \ include/surf/maxmin.h \ include/surf/trace_mgr.h \ @@ -47,19 +59,22 @@ EXTRA_DIST= \ \ 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 + amok/amok_modinter.h \ \ - include/simix/simix.h include/simix/datatypes.h \ - simix/msg_simix_private.h \ + include/simix/simix.h include/simix/datatypes.h \ + simix/private.h \ \ smpi/private.h @@ -108,7 +123,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 \ @@ -169,9 +184,9 @@ GTNETS_SRC= \ surf/gtnets/gtnets_interface.cc \ surf/network_gtnets.c -# Separated because we don't want it in libsimgrid4java -CTX_SRC= xbt/context.c -JCTX_SRC= java/jxbt_context.c java/jxbt_context.h +# 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= xbt/xbt_context.c SIMIX_SRC= \ simix/smx_global.c \ @@ -321,28 +336,22 @@ endif ## ## Java cruft +EXTRA_DIST+=$(JMSG_JAVA_SRC) if HAVE_JAVA -lib_LTLIBRARIES += libsimgrid4java.la - -libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ - $(SIMIX_SRC) $(JCTX_SRC) \ - $(JMSG_C_SRC) $(MSG_SRC) \ - $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) -libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm -libsimgrid4java_la_GCJFLAGS = -fjni - clean-local: -rm -rf .classes 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) +EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC) endif if GRAMINE_MODE @@ -369,7 +378,6 @@ 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@/config_unit.c -CLEANFILES=$(TEST_UNITS) BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \ ../include/xbt/graphxml.h xbt/graphxml.c \ @@ -384,6 +392,8 @@ TESTS_ENVIRONMENT=$(SG_TEST_EXENV) EXTRA_DIST+=$(testall_SOURCES) if MAINTAINER_MODE +CLEANFILES=$(TEST_UNITS) + @builddir@/cunit_unit.c: xbt/cunit.c @top_srcdir@/tools/sg_unit_extractor.pl $^ @builddir@/ex_unit.c: xbt/ex.c @@ -437,18 +447,19 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l if MAINTAINER_MODE surf/surfxml.c: surf/surfxml.l set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_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 $@ 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 $@ if HAVE_FLEXML surf/surfxml.l: $(srcdir)/surf/surfxml.dtd - set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^ + set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^ $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd - set -e; flexml -P surfxml --sysid=surfxml.dtd -H $@ -L $^ + set -e; flexml --root-tags platform -P surfxml --sysid=surfxml.dtd -H $@ -L $^ sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ - xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^ $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd