From: navarrop Date: Tue, 30 Nov 2010 17:32:50 +0000 (+0000) Subject: Remove Makefile.am from autotools. X-Git-Tag: v3_5~60 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e88573354a6448ba3b640e93442f94acd40e8145?hp=e2030cb82d5b8f8b39696794f036e5ffc435f9bf Remove Makefile.am from autotools. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8771 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 30d13f43d7..0000000000 --- a/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ -# 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. - - -# GRAMINE_CUT_BEGIN -SG_SUBDIRS= testsuite teshsuite examples doc buildtools - -SG_EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog \ - acmacro/aci.m4 \ - tools/graspe-slave.in \ - tools/MSG_visualization \ - tools/MSG_visualization/colorize.pl \ - checkall -# GRAMINE_CUT_END - -SUBDIRS= include src tools $(SG_SUBDIRS) -EXTRA_DIST=$(SG_EXTRA_DIST) - -DISTCLEANFILES= stamp.configure stamp.build stamp.check *~ - -ACLOCAL = aclocal -I acmacro -ACLOCAL_AMFLAGS=-I acmacro -AUTOMAKE_OPTIONS = gnu - -check-local: - echo @build_id@ > stamp.check -all-local: - echo @build_id@ > stamp.build - -gramine: - rm -rf gramine-@VERSION@ gramine-@VERSION@.tar* - @echo "# Setup sources..." - for n in `find include src tools/gras -name '*.[ch]' | grep -v -e gras_config.h -e ucontext_stack.h`; do \ - mkdir -p gramine-@VERSION@/`dirname $$n`; \ - perl -e '$$/ = undef; $$l=<>; while ($$l=~ m,(/\*.*?\*/),s) { $$rep=$$1; $$rep=~s/\S//sg; $$l=~s,/\*.*?\*/,$$rep,s; } print $$l;' < $$n > gramine-@VERSION@/$$n; \ - done - @echo "# Copy sources to be generated by configury" - cp src/ucontext_stack.h.in src/gras_config.h.in gramine-@VERSION@/src - @echo "# Remove sources being part of the testsuite" - rm gramine-@VERSION@/src/*_unit.c - @echo "# Adapt the configury mechanism to the gramine context" - mkdir gramine-@VERSION@/acmacro - for n in configure Makefile.in src/Makefile.in include/Makefile.in \ - tools/Makefile.in tools/gras/Makefile.in; do \ - sed -e '/^# GRAMINE_CUT_BEGIN/,/^# GRAMINE_CUT_END/d' \ - -e 's/gramine_mode=no/gramine_mode=yes/' $$n > gramine-@VERSION@/$$n; \ - done - chmod +x gramine-@VERSION@/configure - cp install[-.]sh config.sub config.guess depcomp missing ltmain.sh gramine-@VERSION@/$$n - tar cf gramine-@VERSION@.tar gramine-@VERSION@ ; bzip2 -9 gramine-@VERSION@.tar - tar cf gramine-@VERSION@.tar gramine-@VERSION@ ; gzip -9 gramine-@VERSION@.tar - -if MAINTAINER_MODE -## -## The following is only interesting for me, I guess. -## Some of the targets will only work on my machine ;) -## - -release: distcheck remote debian publish - -debian: dist - $(MAKE) -C ~/CVSIMPORT/pkg-grid/gras maintainerclean - cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/ - cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/@PACKAGE@_@VERSION@.orig.tar.gz - $(MAKE) -C ~/CVSIMPORT/pkg-grid/gras deb check - dput local *.changes - -publish: dist - @echo "----[ Put the tarball @VERSION@ on gforge ]----" -# scp @PACKAGE@-@VERSION@.tar.gz gcl.ucsd.edu:/home/www/simgrid/dl/ -# scp -r doc/html/* gcl.ucsd.edu:/home/www/simgrid/ -# scp -r doc/html/* scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/ - scp ChangeLog gcl.ucsd.edu:/home/www/simgrid/dl/ChangeLog - @echo "----[ Put the tarball @VERSION@ on the local filesystem ]----" - cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/simgrid2 - cp -r doc/html ~/public_html/simgrid2/doc/ - cp ChangeLog ~/public_html/simgrid2/ - $(MAKE) -C ~/public_html - -indent: - indent -br -brs -ce -bbo -bap --dont-break-procedure-type \ - --no-tabs --cuddle-do-while --cuddle-else --indent-level2 \ - --leave-preprocessor-space --no-space-after-function-call-names \ - `$(MAKE) dist-files | grep '\.[ch]$$'|grep -v '/_' |grep -v '_unit.c'\ - | grep -v src/xbt/graphxml.c | grep -v datadesc_structs.c \ - | grep -v simgrid_dtd.[ch]` - -sync-gforge: - chmod g+rw -R doc/ - chmod a+rX -R doc/ - rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times \ - --recursive --links --perms --times --omit-dir-times \ - doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/doc/ || true - scp doc/index.php doc/webcruft/robots.txt scm.gforge.inria.fr:/home/groups/simgrid/htdocs/ - scp doc/simgrid_modules2.png doc/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/ -# ssh scm.gforge.inria.fr "chgrp -R simgrid /home/groups/simgrid/htdocs/" -# ssh scm.gforge.inria.fr "chmod g+rw -R /home/groups/simgrid/htdocs/* || true" -# ssh scm.gforge.inria.fr "chmod a+rX -R /home/groups/simgrid/htdocs/* || true" - -mail: - @ver=`dpkg-parsechangelog -lChangeLog | egrep '^Version: ' | sed 's/Version: //'`;\ - (echo "Hello," ; \ - echo; \ - echo "A new version of SimGrid is available. Here is the changelog:";\ - echo;echo;\ - dpkg-parsechangelog -lChangeLog ;\ - echo;echo; \ - echo "It is available from the official website:";\ - echo " http://simgrid.gforge.inria.fr";\ - echo;echo "Cheers, the SimGrid team.") | \ - mail -e \ - -a "From: Arnaud.Legrand@imag.fr" \ - -s "New version of SimGrid ($$ver)" \ - simgrid-user@lists.gforge.inria.fr - -TAGS: - etags -o ./TAGS `$(MAKE) dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` - -splint: - splint `$(MAKE) dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \ - +matchanyintegral -warnposix +boolint \ - +show-summary +stats\ - -Iinclude -Isrc/include -Isrc/base -Isrc -.PHONY: splint sync-gforge -## -## Cruft for remote compilation -## - -remote: - @$(top_srcdir)/tools/graspe-master - -endif - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/buildtools/Makefile.am b/buildtools/Makefile.am deleted file mode 100644 index dda51a691d..0000000000 --- a/buildtools/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -#EXTRA_DIST = \ -# Cmake/CMakeLists.txt Cmake/chdir_run.sh \ -# Cmake/build.sh Cmake/test_java.sh \ -# Cmake/CTestList.txt Cmake/CTestConfig.cmake - -CLEANFILES = Cmake/CMakeCache.txt Cmake/cmake_install.cmake \ - Cmake/Makefile Cmake/CTestTestfile.cmake Cmake/DartConfiguration.tcl \ - Cmake/CTestCustom.ctest Cmake/*~ - -clean-local: - -rm -rf Cmake/CMakeFiles Cmake/Testing - diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index e6ffaa1133..0000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,151 +0,0 @@ -# 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. - - -DOCSOURCES = $(shell find @top_srcdir@/tools/gras @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \ - $(shell find @srcdir@ -name "*.doc" |grep -v logcategories.doc) -FIGS=simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig gras_comm.fig -PNGS=$(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png - -EXTRA_DIST = html Doxyfile \ - modules.doc FAQ.doc contrib.doc index.doc publis.doc footer.html history.doc \ - $(foreach file,$(FIGS),fig/$(file)) $(PNGS) all.bib - - -CLEANFILES = .*.toc -DISTCLEANFILES = index-API.doc simgrid.tag -MAINTAINERCLEANFILES = html - -if MAINTAINER_MODE -if HAVE_DOXYGEN -simgrid_modules.map: fig/simgrid_modules.fig - $(FIG2DEV) -Lmap fig/simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \ - sed 's/imagemap/simgrid_modules/g' | sed 's/\.gif/.png/' | \ - sed 's/ simgrid_modules.map - -%.png: fig/%.fig - $(FIG2DEV) -Lpng $^ > $@ - -html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) \ - html/gras.html html/amok.html html/msg.html html/simdag.html \ - publis_core_bib.html publis_extern_bib.html publis_intra_bib.html publis_count.html - : # Setting up - touch index-API.doc .FAQ.doc.toc .index.doc.toc .contrib.doc.toc .history.doc.toc - test -e html || mkdir html - cp $(foreach file,$(PNGS),@srcdir@/$(file)) html/ - cp @srcdir@/webcruft/Paje_MSG_screenshot_thn.jpg @srcdir@/webcruft/Paje_MSG_screenshot.jpg html/ - cp @srcdir@/simgrid.css html/ - : # First pass - $(DOXYGEN) Doxyfile >/dev/null - @top_srcdir@/tools/doxygen/index_create.pl simgrid.tag index-API.doc - @top_srcdir@/tools/doxygen/toc_create.pl \ - @srcdir@/FAQ.doc @srcdir@/index.doc @srcdir@/contrib.doc \ - @srcdir@/gtut-introduction.doc @srcdir@/history.doc - : # Second pass - $(DOXYGEN) Doxyfile >/dev/null - : # Post-processing - rm -f html/dir* - @top_srcdir@/tools/doxygen/index_php.pl @srcdir@/index.php.in html/index.html index.php - @top_srcdir@/tools/doxygen/doxygen_postprocesser.pl - -html/gras.html: - mkdir -p html - echo "" > $@ - echo "


Grid Reality And Simulation.

" >> $@ -html/amok.html: - echo "" > $@ - echo "


Advanced Metacomputing Overlay Kit.

" >> $@ -html/msg.html: - echo "" > $@ - echo "


Meta SimGrid.

" >> $@ -html/simdag.html: - echo "" > $@ - echo "


DAG Simulator.

" >> $@ - -if HAVE_BIBTEX2HTML - -publis_count.html: all.bib - @top_srcdir@/tools/doxygen/bibtex2html_table_count.pl < $^ > $@ - -publis_core.bib: all.bib - $(BIBTOOL) -- 'select.by.string={category "core"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' $< > $@ - -publis_extern.bib: all.bib - $(BIBTOOL) -- 'select.by.string={category "extern"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' $< > $@ - -publis_intra.bib: all.bib - $(BIBTOOL) -- 'select.by.string={category "intra"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' $< > $@ - -%_bib.latin1.html: %.bib - $(BIBTEX2HTML) -single-output -nv -force -sort year -copy-icons $^ | @top_srcdir@/tools/doxygen/bibtex2html_postprocessor.pl > $@ - -%_bib.html: %_bib.latin1.html - $(ICONV) --from-code latin1 --to-code utf8 $^ --output $@ -endif - -publish: - $(MAKE) -C .. sync-gforge -endif -endif - -./logcategories.doc: $(DOCSOURCES) - pwd=`pwd`; rm -f $$pwd/logcategories.doc; set -e; \ - echo "/* Generated file, do not edit */" > $$pwd/logcategories.doc; \ - echo "/** \addtogroup XBT_log_cats" >> $$pwd/logcategories.doc; \ - echo " @{" >> $$pwd/logcategories.doc; \ - cd @top_srcdir@/src; ../tools/doxygen/xbt_log_extract_hierarchy.pl >> $$pwd/logcategories.doc; \ - echo "@}*/" >> $$pwd/logcategories.doc; - -install-data-local: - @for file in `find html/ -type d` ; do \ - echo "test -z \"$(prefix)/doc/simgrid/$$file\" || $(mkdir_p) \"$(prefix)/doc/simgrid/$$file\"";\ - test -z "$(DESTDIR)/$(prefix)/doc/simgrid/$$file" || $(mkdir_p) "$(DESTDIR)/$(prefix)/doc/simgrid/$$file";\ - done - @for file in `find html/ -type f` ; do \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)/$(prefix)/doc/simgrid/$$file'";\ - $(INSTALL_DATA) $$file $(DESTDIR)/$(prefix)/doc/simgrid/$$file ;\ - done - -uninstall-local: - for file in `find html/ -type f` ; do \ - echo " rm -f '$(prefix)/doc/simgrid/$$file'";\ - rm -f $(prefix)/doc/simgrid/$$file ;\ - done - - -check-gtut-tocs: - @echo Check individual TOCs - @for n in gtut-tour-*.doc ; do \ - sed -n '/Table of Contents/,/hr/p' $$n|grep ref > tmp.curtoc; \ - \ - grep -E '\\s?u?b?section' $$n | grep -v _toc| \ - sed -e 's/\\section //' -e 's/\\subsection /subsection/' -e 's/ .*//' |\ - sed -e 's/^/ - \\ref /' -e 's/- \\ref subsection/ - \\ref /' > tmp.realtoc; \ - \ - if ! diff -q tmp.curtoc tmp.realtoc >/dev/null; then \ - echo Wrong toc for $$n. Should be ; \ - cat tmp.realtoc; \ - fi ; \ - done - @rm tmp.realtoc tmp.curtoc - @echo "Check main TOC" - @for n in gtut-tour-*doc; do \ - grep @page $$n |sed -e 's/@page //' -e 's/ .*//' -e 's/^/ - \\ref /' >>tmp.realtoc;\ - sed -n -e '/Table of Contents/,/hr/p' $$n|sed -e 's/^/ /'|\ - grep -v toc|grep -v '
'|grep [^[:blank:]] >>tmp.realtoc;\ - done - @grep ' *- \\ref' gtut-tour.doc > tmp.curtoc - @if ! diff -b -u tmp.curtoc tmp.realtoc ; then \ - echo "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc"; \ - else \ - rm tmp.realtoc; \ - fi ; - @rm tmp.curtoc - -.PHONY: html html/ - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 245fccc1c7..0000000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# 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. - -EXTRA_DIST= platforms/prop.xml \ - platforms/metaxml.xml platforms/metaxml-random.xml - -SUBDIRS= msg gras amok simdag java smpi simdag - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/amok/Makefile.am b/examples/amok/Makefile.am deleted file mode 100644 index 70724b36f0..0000000000 --- a/examples/amok/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -AM_CFLAGS=-g - -EXTRA_DIST= -noinst_PROGRAMS= - -TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh -TESTS= -XFAIL_TESTS= - -LDADD_SG=$(top_builddir)/src/libsimgrid.la -LDADD_RL=$(top_builddir)/src/libgras.la - -################### -# Bandwidth tests # -################### -EXTRA_DIST+=bandwidth/bandwidth.xml -if GRAS_ARCH_32_BITS - TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_32.tesh -else - TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_64.tesh -endif -XFAIL_TESTS+=bandwidth/bandwidth_rl.tesh - -noinst_PROGRAMS += \ - bandwidth/bandwidth_maestro \ - bandwidth/bandwidth_sensor \ - bandwidth/bandwidth_simulator - -bandwidth_bandwidth_simulator_SOURCES= bandwidth/bandwidth.c bandwidth/_bandwidth_simulator.c -bandwidth_bandwidth_maestro_SOURCES= bandwidth/bandwidth.c bandwidth/_bandwidth_maestro.c -bandwidth_bandwidth_sensor_SOURCES= bandwidth/bandwidth.c bandwidth/_bandwidth_sensor.c - -bandwidth_bandwidth_simulator_LDADD= $(LDADD_SG) -bandwidth_bandwidth_maestro_LDADD= $(LDADD_RL) -bandwidth_bandwidth_sensor_LDADD= $(LDADD_RL) - - -# Take care of generatated sources -bandwidth/_bandwidth_simulator.c bandwidth/_bandwidth_sensor.c bandwidth/_bandwidth_maestro.c : bandwidth/bandwidth.c bandwidth/bandwidth.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ - cd bandwidth; $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ bandwidth $(abs_top_srcdir)/examples/amok/bandwidth/bandwidth.xml - -################### -# saturate tests # -################### -EXTRA_DIST+=saturate/saturate.xml - -if GRAS_ARCH_32_BITS - TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_32.tesh -else - TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_64.tesh - XFAIL_TESTS += saturate/saturate_sg_64.tesh -endif -XFAIL_TESTS += saturate/saturate_rl.tesh - - -noinst_PROGRAMS += \ - saturate/saturate_maestro \ - saturate/saturate_sensor \ - saturate/saturate_simulator - -saturate_saturate_simulator_SOURCES= saturate/saturate.c saturate/_saturate_simulator.c -saturate_saturate_maestro_SOURCES= saturate/saturate.c saturate/_saturate_maestro.c -saturate_saturate_sensor_SOURCES= saturate/saturate.c saturate/_saturate_sensor.c - -saturate_saturate_simulator_LDADD= $(LDADD_SG) -saturate_saturate_maestro_LDADD= $(LDADD_RL) -saturate_saturate_sensor_LDADD= $(LDADD_RL) - - -# Take care of generatated sources -saturate/_saturate_simulator.c saturate/_saturate_sensor.c saturate/_saturate_maestro.c : saturate/saturate.c saturate/saturate.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ - cd saturate; $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ saturate $(abs_top_srcdir)/examples/amok/saturate/saturate.xml - - - -######### -# Cruft # -######### -EXTRA_DIST+=$(TESTS) -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/amok/alnem/Makefile.am b/examples/amok/alnem/Makefile.am deleted file mode 100644 index 77d5b5bb6e..0000000000 --- a/examples/amok/alnem/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# 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. - - -DISTCLEANFILES=Makefile.in -INCLUDES= -I$(top_srcdir)/src/include -#-I../../src -I../../nws_portability/Include @CFLAGS_SimGrid@ -AM_CFLAGS=-g - -check_PROGRAMS=alnem_simulator alnem_sensor alnem_maestro - -alnem_simulator_SOURCES= _alnem_simulator.c alnem.c -alnem_sensor_SOURCES= _alnem_sensor.c alnem.c -alnem_maestro_SOURCES= _alnem_maestro.c alnem.c - - -alnem_simulator_LDADD= $(top_srcdir)/src/base/libgrassg.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ -alnem_sensor_LDADD= $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ -alnem_maestro_LDADD= $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ - -bin_PROGRAMS=alnem_builder -alnem_builder_LDADD= @LIBS_SimGrid@ - -# Take care of generatated sources -NAME=alnem -PROCESSES=sensor maestro -include $(top_srcdir)/examples/temps-gras-stub.mk - - - - diff --git a/examples/amok/bandwidth/Makefile.am b/examples/amok/bandwidth/Makefile.am deleted file mode 100644 index 835f169cd1..0000000000 --- a/examples/amok/bandwidth/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -AM_CFLAGS=-g -TESTS=test_rl test_sg -EXTRA_DIST=bandwidth.xml $(TESTS) - -noinst_PROGRAMS=bandwidth_maestro bandwidth_sensor bandwidth_simulator - -bandwidth_simulator_SOURCES= _bandwidth_simulator.c bandwidth.c -bandwidth_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -bandwidth_maestro_SOURCES= _bandwidth_maestro.c bandwidth.c -bandwidth_maestro_LDADD= $(top_builddir)/src/libgras.la - -bandwidth_sensor_SOURCES= _bandwidth_sensor.c bandwidth.c -bandwidth_sensor_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=bandwidth -PROCESSES= maestro sensor -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/amok/saturate/Makefile.am b/examples/amok/saturate/Makefile.am deleted file mode 100644 index 2c6a6378f1..0000000000 --- a/examples/amok/saturate/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -AM_CFLAGS=-g - -TESTS=test_rl test_sg -EXTRA_DIST=saturate.xml $(TESTS) - -noinst_PROGRAMS=saturate_simulator saturate_sensor saturate_maestro - -saturate_simulator_SOURCES=_saturate_simulator.c saturate.c -saturate_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -saturate_sensor_SOURCES= _saturate_sensor.c saturate.c -saturate_maestro_SOURCES= _saturate_maestro.c saturate.c - -saturate_sensor_LDADD= $(top_builddir)/src/libgras.la -saturate_maestro_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=saturate -PROCESSES=sensor maestro -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/Makefile.am b/examples/gras/Makefile.am deleted file mode 100644 index 7570b3ecae..0000000000 --- a/examples/gras/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# 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. - - -SUBDIRS= ping rpc spawn timer chrono mutual_exclusion/simple_token \ - mmrpc all2all pmm synchro properties -#replay -# p2p - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/all2all/Makefile.am b/examples/gras/all2all/Makefile.am deleted file mode 100644 index bb2057a6b3..0000000000 --- a/examples/gras/all2all/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -EXTRA_DIST=all2all.xml make_deployment.pl -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=all2all_sender all2all_receiver all2all_simulator - -all2all_simulator_SOURCES= _all2all_simulator.c all2all.c -all2all_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -all2all_sender_SOURCES= _all2all_sender.c all2all.c -all2all_sender_LDADD= $(top_builddir)/src/libgras.la - -all2all_receiver_SOURCES= _all2all_receiver.c all2all.c -all2all_receiver_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=all2all -PROCESSES= sender receiver -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/chrono/Makefile.am b/examples/gras/chrono/Makefile.am deleted file mode 100644 index 0f26124986..0000000000 --- a/examples/gras/chrono/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -AM_CFLAGS=-g -EXTRA_DIST=chrono.xml -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=chrono_simulator chrono_multiplier - -chrono_simulator_SOURCES= _chrono_simulator.c chrono.c -chrono_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -chrono_multiplier_SOURCES= _chrono_multiplier.c chrono.c -chrono_multiplier_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=chrono -PROCESSES=multiplier -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/mmrpc/Makefile.am b/examples/gras/mmrpc/Makefile.am deleted file mode 100644 index 01eba1d330..0000000000 --- a/examples/gras/mmrpc/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -EXTRA_DIST=mmrpc.xml mmrpc.h -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=mmrpc_client mmrpc_server mmrpc_simulator - -mmrpc_simulator_SOURCES=_mmrpc_simulator.c mmrpc_common.c mmrpc_client.c mmrpc_server.c -mmrpc_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -mmrpc_client_SOURCES= _mmrpc_client.c mmrpc_common.c mmrpc_client.c -mmrpc_client_LDADD= $(top_builddir)/src/libgras.la - -mmrpc_server_SOURCES= _mmrpc_server.c mmrpc_common.c mmrpc_server.c -mmrpc_server_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=mmrpc -PROCESSES= client server -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/mutual_exclusion/simple_token/Makefile.am b/examples/gras/mutual_exclusion/simple_token/Makefile.am deleted file mode 100644 index a5bcc2ec6a..0000000000 --- a/examples/gras/mutual_exclusion/simple_token/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -EXTRA_DIST=simple_token.xml -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=simple_token_node simple_token_simulator - -simple_token_simulator_SOURCES= _simple_token_simulator.c simple_token.c -simple_token_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -simple_token_node_SOURCES= _simple_token_node.c simple_token.c -simple_token_node_LDADD= $(top_builddir)/src/libgras.la - -# generate temps -NAME=simple_token -PROCESSES=node -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/p2p/Makefile.am b/examples/gras/p2p/Makefile.am deleted file mode 100644 index 7d8fe7f491..0000000000 --- a/examples/gras/p2p/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# 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. - - -SUBDIRS= chord can - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/p2p/can/Makefile.am b/examples/gras/p2p/can/Makefile.am deleted file mode 100644 index d3d5ddbb22..0000000000 --- a/examples/gras/p2p/can/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -#TESTS= test_rl test_sg -EXTRA_DIST=can_tests.c types.h can.xml $(TESTS) - -# AUTOMAKE variable definition -noinst_PROGRAMS=can_node can_start_war can_simulator - -can_simulator_SOURCES= _can_simulator.c can.c # can_tests.c -can_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -can_node_SOURCES= _can_node.c can.c # can_tests.c -can_node_LDADD= $(top_builddir)/src/libgras.la - -can_start_war_SOURCES= _can_node.c can.c # can_tests.c -can_start_war_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=can -PROCESSES=node start_war -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/p2p/chord/Makefile.am b/examples/gras/p2p/chord/Makefile.am deleted file mode 100644 index e7e0ce7e3b..0000000000 --- a/examples/gras/p2p/chord/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -#TESTS= test_rl test_sg -EXTRA_DIST=chord.xml $(TESTS) - -# AUTOMAKE variable definition -noinst_PROGRAMS=chord_node chord_simulator - -chord_simulator_SOURCES= _chord_simulator.c chord.c -chord_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -chord_node_SOURCES= _chord_node.c chord.c -chord_node_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=chord -PROCESSES=node -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/ping/Makefile.am b/examples/gras/ping/Makefile.am deleted file mode 100644 index 70f33833b7..0000000000 --- a/examples/gras/ping/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include - -EXTRA_DIST=ping.xml ping.h -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=ping_client ping_server ping_simulator - -ping_simulator_SOURCES= _ping_simulator.c ping_server.c ping_client.c ping_common.c -ping_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -ping_client_SOURCES= _ping_client.c ping_client.c ping_common.c -ping_client_LDADD= $(top_builddir)/src/libgras.la - -ping_server_SOURCES= _ping_server.c ping_server.c ping_common.c -ping_server_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=ping -PROCESSES= client server -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/pmm/Makefile.am b/examples/gras/pmm/Makefile.am deleted file mode 100644 index 96d20d2e8f..0000000000 --- a/examples/gras/pmm/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -EXTRA_DIST=pmm.xml -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=pmm_slave pmm_master pmm_simulator - -pmm_simulator_SOURCES=_pmm_simulator.c pmm.c -pmm_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -pmm_slave_SOURCES= _pmm_slave.c pmm.c -pmm_slave_LDADD= $(top_builddir)/src/libgras.la - -pmm_master_SOURCES= _pmm_master.c pmm.c -pmm_master_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=pmm -PROCESSES= slave master -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/properties/Makefile.am b/examples/gras/properties/Makefile.am deleted file mode 100644 index dcdd24f5a1..0000000000 --- a/examples/gras/properties/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include - -EXTRA_DIST= -include $(top_srcdir)/examples/gras/tests.mk - -# override EXTRA_DIST and TESTS since we do not have 32bits and 64bits variants of the sg test here -EXTRA_DIST=properties.xml test_sg test_rl -TESTS=test_sg test_rl - - -# AUTOMAKE variable definition -noinst_PROGRAMS=properties_alice properties_bob properties_simulator - -properties_simulator_SOURCES= _properties_simulator.c properties.c -properties_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -properties_alice_SOURCES= _properties_alice.c properties.c -properties_alice_LDADD= $(top_builddir)/src/libgras.la - -properties_bob_SOURCES= _properties_bob.c properties.c -properties_bob_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=properties -PROCESSES= alice bob -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/replay/Makefile.am b/examples/gras/replay/Makefile.am deleted file mode 100644 index 9949d2ef0f..0000000000 --- a/examples/gras/replay/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include -EXTRA_DIST= -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=replay_worker replay_master replay_simulator - -replay_simulator_SOURCES=_replay_simulator.c replay.c xbt_workload.c -replay_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -replay_master_SOURCES= _replay_master.c replay.c xbt_workload.c -replay_master_LDADD= $(top_builddir)/src/libgras.la - -replay_worker_SOURCES= _replay_worker.c replay.c xbt_workload.c -replay_worker_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=replay -PROCESSES= master worker -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/rpc/Makefile.am b/examples/gras/rpc/Makefile.am deleted file mode 100644 index 47a3cdd05d..0000000000 --- a/examples/gras/rpc/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -EXTRA_DIST=rpc.xml -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=rpc_client rpc_forwarder rpc_server rpc_simulator - -rpc_simulator_SOURCES= _rpc_simulator.c rpc.c -rpc_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -rpc_client_SOURCES= _rpc_client.c rpc.c -rpc_client_LDADD= $(top_builddir)/src/libgras.la - -rpc_forwarder_SOURCES= _rpc_forwarder.c rpc.c -rpc_forwarder_LDADD= $(top_builddir)/src/libgras.la - -rpc_server_SOURCES= _rpc_server.c rpc.c -rpc_server_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=rpc -PROCESSES= client forwarder server -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/spawn/Makefile.am b/examples/gras/spawn/Makefile.am deleted file mode 100644 index a5c8735e70..0000000000 --- a/examples/gras/spawn/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include - -EXTRA_DIST=spawn.xml spawn.h -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=spawn_child spawn_father spawn_simulator - -spawn_simulator_SOURCES= _spawn_simulator.c spawn_father.c spawn_child.c spawn_common.c -spawn_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -spawn_child_SOURCES= _spawn_child.c spawn_child.c spawn_common.c -spawn_child_LDADD= $(top_builddir)/src/libgras.la - -spawn_father_SOURCES= _spawn_father.c spawn_father.c spawn_child.c spawn_common.c -spawn_father_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -# (manually since the child is not in the deployment file, so we need an extra argument to the stub generator) - -_spawn_father.c _spawn_child.c _spawn_simulator.c: $(srcdir)/spawn.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ - [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ --extra-process=child spawn $(srcdir)/spawn.xml - -$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@: - make -C $(top_builddir)/tools/gras/ gras_stub_generator@EXEEXT@ - -CLEANFILES = _spawn_simulator.c spawn.mk _spawn_father.c _spawn_child.c -MOSTLYCLEANFILES = spawn.trace - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/synchro/Makefile.am b/examples/gras/synchro/Makefile.am deleted file mode 100644 index b90a251488..0000000000 --- a/examples/gras/synchro/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include - -EXTRA_DIST=synchro.xml -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=synchro_philosopher synchro_simulator - -synchro_simulator_SOURCES= _synchro_simulator.c philosopher.c -synchro_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -synchro_philosopher_SOURCES= _synchro_philosopher.c philosopher.c -synchro_philosopher_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -# (manually since the child is not in the deployment file, so we need an extra argument to the stub generator) - -_synchro_simulator.c _synchro_philosopher.c: $(srcdir)/synchro.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ - [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ synchro $(srcdir)/synchro.xml - -$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@: - make -C $(top_builddir)/tools/gras/ gras_stub_generator@EXEEXT@ - -CLEANFILES = _synchro_simulator.c synchro.mk _synchro_philosopher.c -MOSTLYCLEANFILES = synchro.trace - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/gras/timer/Makefile.am b/examples/gras/timer/Makefile.am deleted file mode 100644 index abd8db148f..0000000000 --- a/examples/gras/timer/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# 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. - - -INCLUDES= -I$(top_srcdir)/include -AM_CFLAGS=-g - -EXTRA_DIST=$(NAME).xml $(TESTS) -include $(top_srcdir)/examples/gras/tests.mk - -# AUTOMAKE variable definition -noinst_PROGRAMS=timer_client timer_simulator - -timer_simulator_SOURCES= _timer_simulator.c timer.c -timer_simulator_LDADD= $(top_builddir)/src/libsimgrid.la - -timer_client_SOURCES= _timer_client.c timer.c -timer_client_LDADD= $(top_builddir)/src/libgras.la - -# Take care of generatated sources -NAME=timer -PROCESSES= client -include $(top_srcdir)/examples/temps-gras-stub.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/java/Makefile.am b/examples/java/Makefile.am deleted file mode 100644 index f2f4600e6d..0000000000 --- a/examples/java/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# 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. - - -SUBDIRS= basic ping_pong comm_time suspend - -EXTRA_DIST=java_test.mk runtest -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/java/basic/Makefile.am b/examples/java/basic/Makefile.am deleted file mode 100644 index 7a3b3c9a37..0000000000 --- a/examples/java/basic/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# 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. - - -EXTRA_DIST=basic_deployment.xml basic_platform.xml - -# Declare sources: -JAVA_SRC=Master.java Forwarder.java Slave.java BasicTest.java \ - FinalizeTask.java -JAVA_TESTS=BasicTest.class -TESTS=$(JAVA_TESTS) - -EXTRA_DIST+=$(JAVA_SRC) - -# Declare test class -if HAVE_JAVA - noinst_JAVA=$(JAVA_SRC) -endif - -include $(srcdir)/../java_test.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/java/comm_time/Makefile.am b/examples/java/comm_time/Makefile.am deleted file mode 100644 index a87ab18450..0000000000 --- a/examples/java/comm_time/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2004-2010. 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. - - -EXTRA_DIST=comm_time_deployment.xml comm_time_platform.xml - -# Declare sources: -JAVA_SRC=Master.java Slave.java CommTimeTest.java FinalizeTask.java -JAVA_TESTS=CommTimeTest.class -TESTS=$(JAVA_TESTS) - -EXTRA_DIST+=$(JAVA_SRC) - -# Declare test class -if HAVE_JAVA - noinst_JAVA=$(JAVA_SRC) -endif - -include $(srcdir)/../java_test.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/java/ping_pong/Makefile.am b/examples/java/ping_pong/Makefile.am deleted file mode 100644 index 39e1cb79c4..0000000000 --- a/examples/java/ping_pong/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# 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. - - -EXTRA_DIST=ping_pong_deployment.xml ping_pong_platform.xml - -# Declare sources: -JAVA_SRC=Sender.java Receiver.java PingPongTask.java PingPongTest.java -JAVA_TESTS=PingPongTest.class -TESTS=$(JAVA_TESTS) - -EXTRA_DIST+=$(JAVA_SRC) - -# Declare test class -if HAVE_JAVA - noinst_JAVA=$(JAVA_SRC) -endif - -include $(srcdir)/../java_test.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/java/suspend/Makefile.am b/examples/java/suspend/Makefile.am deleted file mode 100644 index 183f15a3a0..0000000000 --- a/examples/java/suspend/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# 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. - - -EXTRA_DIST=suspend_deployment.xml suspend_platform.xml - -# Declare sources: -JAVA_SRC=DreamMaster.java LazyGuy.java SuspendTest.java -JAVA_TESTS=SuspendTest.class -TESTS=$(JAVA_TESTS) - -EXTRA_DIST+=$(JAVA_SRC) - -# Declare test class -if HAVE_JAVA - noinst_JAVA=$(JAVA_SRC) -endif - -include $(srcdir)/../java_test.mk - -# Cruft -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am deleted file mode 100644 index aae1c9eac5..0000000000 --- a/examples/msg/Makefile.am +++ /dev/null @@ -1,186 +0,0 @@ -# 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. - - -INCLUDES = -I$(top_srcdir)/include -AM_CFLAGS = -g - -EXTRA_DIST = msg_platform.xml \ - small_platform.xml \ - small_platform_with_failures.xml \ - jupiter_state.trace link5_state.trace \ - sendrecv/platform_sendrecv.xml \ - sendrecv/deployment_sendrecv.xml \ - suspend/deployment_suspend.xml \ - masterslave/deployment_masterslave_forwarder.xml \ - masterslave/deployment_masterslave.xml \ - migration/migration.deploy \ - gtnets/onelink-p.xml \ - gtnets/onelink-d.xml \ - gtnets/dogbone-d.xml \ - gtnets/dogbone-p.xml \ - gtnets/waxman-d.xml \ - gtnets/waxman-p.xml \ - parallel_task/test_ptask_deployment.xml \ - parallel_task/test_ptask_platform.xml \ - priority/deployment_priority.xml \ - properties/deployment_properties.xml \ - trace/test_trace_integration.xml \ - trace/file.trace \ - trace/test1.xml \ - trace/test2.xml \ - trace/test3.xml \ - trace/test4.xml \ - trace/test5.xml \ - trace/test6.xml \ - trace/test7.xml \ - trace/test8.xml \ - trace/test9.xml \ - trace/test10.xml \ - trace/test11.xml \ - fafard_state.trace jupiter_state.trace link5_state.trace - - -TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh - - -TESTS = sendrecv/sendrecv_CLM03.tesh \ - sendrecv/sendrecv_Vegas.tesh \ - sendrecv/sendrecv_Reno.tesh \ - suspend/suspend.tesh \ - masterslave/masterslave.tesh \ - masterslave/masterslave_forwarder.tesh \ - masterslave/masterslave_failure.tesh \ - masterslave/masterslave_bypass.tesh \ - migration/migration.tesh \ - parallel_task/parallel_task.tesh \ - priority/priority.tesh \ - properties/msg_prop.tesh \ - trace/trace.tesh \ - masterslave/masterslave_cpu_ti.tesh - -if HAVE_GTNETS - TESTS += gtnets/gtnets.tesh -endif - -CLEANFILES = sendrecv/*~ \ - sendrecv/sendrecv \ - suspend/*~ \ - suspend/suspend \ - masterslave/*~ \ - masterslave/masterslave_forwarder \ - masterslave/masterslave_failure \ - masterslave/masterslave_bypass \ - parallel_task/parallel_task \ - parallel_task/test_ptask \ - priority/priority \ - properties/msg_prop \ - trace/test_trace_integration - -if HAVE_GTNETS - CLEANFILES += gtnets/gtnets -endif - - - - -noinst_PROGRAMS = sendrecv/sendrecv \ - suspend/suspend \ - masterslave/masterslave_mailbox \ - masterslave/masterslave_forwarder \ - masterslave/masterslave_failure \ - masterslave/masterslave_bypass \ - migration/migration \ - parallel_task/parallel_task \ - parallel_task/test_ptask \ - priority/priority \ - properties/msg_prop \ - actions/actions \ - trace/test_trace_integration \ - mc/centralized \ - mc/bugged1 \ - mc/bugged2 - -if HAVE_GTNETS - noinst_PROGRAMS += gtnets/gtnets -endif - - -# property handle example -properties_msg_prop_SOURCES = properties/msg_prop.c -properties_msg_prop_LDADD = $(top_builddir)/src/libsimgrid.la - -# actions example -actions_actions_SOURCES = actions/actions.c -actions_actions_LDADD = $(top_builddir)/src/libsimgrid.la -actions_actions_CFLAGS = -I$(top_builddir)/src/include - -# migration example -migration_migration_SOURCES = migration/migration.c -migration_migration_LDADD = $(top_builddir)/src/libsimgrid.la - - -# sendrecv simple example -sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c -sendrecv_sendrecv_LDADD = $(top_builddir)/src/libsimgrid.la - -# suspend/resume simple example -suspend_suspend_SOURCES = suspend/suspend.c -suspend_suspend_LDADD = $(top_builddir)/src/libsimgrid.la - -# parallel task example -parallel_task_parallel_task_SOURCES = parallel_task/parallel_task.c -parallel_task_parallel_task_LDADD = $(top_builddir)/src/libsimgrid.la -parallel_task_test_ptask_SOURCES = parallel_task/test_ptask.c -parallel_task_test_ptask_LDADD = $(top_builddir)/src/libsimgrid.la - -# playing with priorities example -priority_priority_SOURCES = priority/priority.c -priority_priority_LDADD = $(top_builddir)/src/libsimgrid.la - -# master/slave application example using a forwarder module -masterslave_masterslave_forwarder_SOURCES = masterslave/masterslave_forwarder.c -masterslave_masterslave_forwarder_LDADD = $(top_builddir)/src/libsimgrid.la - -# master/slave application example using a mailboxes -masterslave_masterslave_mailbox_SOURCES = masterslave/masterslave_mailbox.c -masterslave_masterslave_mailbox_LDADD = $(top_builddir)/src/libsimgrid.la - -# master/slave application example with failures -masterslave_masterslave_failure_SOURCES = masterslave/masterslave_failure.c -masterslave_masterslave_failure_LDADD = $(top_builddir)/src/libsimgrid.la - -# bypass the surf xml parser -masterslave_masterslave_bypass_SOURCES = masterslave/masterslave_bypass.c -masterslave_masterslave_bypass_LDADD = $(top_builddir)/src/libsimgrid.la - -# bypass the surf xml parser -trace_test_trace_integration_SOURCES = trace/test_trace_integration.c -trace_test_trace_integration_LDADD = $(top_builddir)/src/libsimgrid.la - -# Model-checking examples -mc_centralized_SOURCES = mc/centralized_mutex.c -mc_centralized_LDADD = $(top_builddir)/src/libsimgrid.la - -# bugged example 1 -mc_bugged1_SOURCES = mc/bugged1.c -mc_bugged1_LDADD = $(top_builddir)/src/libsimgrid.la - -# bugged example 2 -mc_bugged2_SOURCES = mc/bugged2.c -mc_bugged2_LDADD = $(top_builddir)/src/libsimgrid.la - - -# verify if the GTNETS feature is working -if HAVE_GTNETS -gtnets_gtnets_SOURCES = gtnets/gtnets.c -gtnets_gtnets_LDADD = $(top_builddir)/src/libsimgrid.la -else - EXTRA_DIST+= gtnets/gtnets.c -endif - -EXTRA_DIST+=$(TESTS) -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/simdag/Makefile.am b/examples/simdag/Makefile.am deleted file mode 100644 index 660bc05275..0000000000 --- a/examples/simdag/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -# 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. - - -INCLUDES = -I$(top_srcdir)/include -AM_CFLAGS = -g -EXTRA_DIST = 2clusters.xml - -CLEANFILES = sd_test.trace - -TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh - -TESTS = test_simdag.tesh test_simdag2.tesh properties/test_prop.tesh metaxml/metaxml_test.tesh -noinst_PROGRAMS = sd_test sd_test2 properties/sd_prop metaxml/sd_meta\ - dax/dax_test -XFAIL_TESTS = metaxml/metaxml_test.tesh - -properties_sd_prop_SOURCES = properties/sd_prop.c -properties_sd_prop_LDADD = $(top_builddir)/src/libsimgrid.la - -dax_dax_test_SOURCES = dax/dax_test.c -dax_dax_test_LDADD = $(top_builddir)/src/libsimgrid.la - -metaxml_sd_meta_SOURCES = metaxml/sd_meta.c -metaxml_sd_meta_LDADD = $(top_builddir)/src/libsimgrid.la - -sd_test_SOURCES = sd_test.c -sd_test_LDADD = $(top_builddir)/src/libsimgrid.la - -sd_test2_SOURCES = sd_test2.c -sd_test2_LDADD = $(top_builddir)/src/libsimgrid.la - -EXTRA_DIST+=$(TESTS) -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/smpi/Makefile.am b/examples/smpi/Makefile.am deleted file mode 100644 index 0b11defa80..0000000000 --- a/examples/smpi/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (c) 2004-2009. 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. - - -# HOW TO ADD A NEW EXAMPLE: -# -# - add the binary name into the noinst_PROGRAMS variable -# - add a rule to compile the program, inspired from the existing ones -# - add a tesh file running it in several conditions. -# Write the file taking the others as example, and after reading -# /tools/tesh/README.tesh -# - List the tesh file in the TESTS variable so that it gets tested on make check - -noinst_PROGRAMS = allreduce bcast bcbench compute compute2 compute3 first pingpong second sendrecv mvmul split scatter reduce - -alltoall2: alltoall2.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -alltoall_basic: alltoall_basic.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -alltoallv: alltoallv.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -allreduce: allreduce.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -bcast: bcast.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -bcbench: bcbench.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -compute: compute.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -compute2: compute2.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -compute3: compute3.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -first: mvmul.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -pingpong: pingpong.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -second: second.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -scatter: scatter.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -reduce: reduce.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -split: split.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -mvmul: mvmul.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ -sendrecv: sendrecv.c - $(top_builddir)/src/smpi/smpicc $^ -o $@ - -# List the tesh files below -TESTS = bcast.tesh reduce.tesh - -# No need to change anything after that line -TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh -EXTRA_DIST = $(TESTS) hostfile -CLEANFILES = *~ - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 864f9a9211..0000000000 --- a/include/Makefile.am +++ /dev/null @@ -1,68 +0,0 @@ -# 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. - -EXTRA_DIST=simgrid_config.h.in - -include_HEADERS = gras.h xbt.h simgrid_config.h -nobase_include_HEADERS = \ - xbt/misc.h \ - xbt/sysdep.h \ - xbt/virtu.h \ - xbt/str.h xbt/strbuff.h xbt/hash.h \ - xbt/function_types.h \ - xbt/asserts.h xbt/ex.h \ - xbt/log.h \ - xbt/module.h \ - xbt/mallocator.h \ - xbt/dynar.h xbt/dict.h xbt/set.h \ - xbt/heap.h \ - xbt/graph.h \ - xbt/fifo.h \ - xbt/swag.h \ - xbt/matrix.h \ - xbt/peer.h \ - xbt/config.h \ - xbt/cunit.h \ - xbt/graphxml_parse.h \ - xbt/graphxml.h \ - \ - xbt/time.h \ - xbt/synchro.h xbt/synchro_core.h\ - xbt/queue.h \ - xbt/setset.h \ - xbt/mmalloc.h \ - \ - msg/msg.h \ - msg/datatypes.h \ - \ - simdag/simdag.h \ - simdag/datatypes.h \ - \ - smpi/smpi.h \ - smpi/mpi.h \ - \ - surf/surfxml_parse.h \ - surf/simgrid_dtd.h \ - \ - gras/datadesc.h gras/transport.h \ - gras/virtu.h gras/emul.h gras/process.h gras/module.h \ - \ - gras/messages.h gras/timer.h \ - \ - amok/peermanagement.h \ - amok/bandwidth.h \ - \ - instr/instr.h \ - instr/config.h - -surf/simgrid_dtd.h: - $(MAKE) -C ../src ../include/surf/simgrid_dtd.h - -xbt/graphxml.h: - $(MAKE) -C ../src ../include/xbt/graphxml.h - - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 0ff1ac69b5..0000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,609 +0,0 @@ -# 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. -# -DNDEBUG cuts asserts and logs at "trace" and "debug" levels. - - - -MAINTAINERCLEANFILES=Makefile.in -INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include - -bin_SCRIPTS= smpi/smpicc smpi/smpirun - -EXTRA_DIST= \ - \ - portable.h \ - \ - xbt/mallocator_private.h \ - xbt/dict_private.h \ - xbt/heap_private.h \ - xbt/fifo_private.h \ - xbt/graph_private.h \ - xbt/graphxml_parse.c \ - xbt/graphxml.l \ - xbt/graphxml.c \ - xbt/graphxml.dtd \ - xbt/log_private.h \ - xbt/ex_interface.h \ - xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \ - \ - surf/maxmin_private.h \ - surf/trace_mgr_private.h \ - surf/surf_private.h \ - surf/surfxml_parse.c \ - surf/simgrid_dtd.l \ - surf/simgrid_dtd.c \ - surf/simgrid.dtd \ - surf/network_private.h \ - surf/network_gtnets_private.h \ - 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 \ - include/surf/maxmin.h \ - include/surf/trace_mgr.h \ - include/surf/surf.h \ - include/surf/surfxml_parse_private.h \ - include/surf/random_mgr.h \ - include/surf/surf_resource_lmm.h \ - \ - include/xbt/wine_dbghelp.h \ - include/xbt/xbt_os_time.h \ - include/xbt/xbt_os_thread.h \ - \ - msg/private.h \ - msg/mailbox.h \ - \ - simdag/private.h \ - simdag/dax.dtd \ - simdag/dax_dtd.l \ - simdag/dax_dtd.h \ - simdag/dax_dtd.c \ - \ - gras/DataDesc/ddt_parse.yy.l \ - gras/DataDesc/ddt_parse.yy.h \ - 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 \ - \ - include/simix/simix.h include/simix/datatypes.h \ - include/simix/context.h \ - simix/private.h \ - simix/smx_context_private.h \ - simix/smx_context_java.h \ - \ - smpi/private.h \ - smpi/smpi_coll_private.h \ - smpi/smpi_mpi_dt_private.h \ - smpi/README \ - \ - mk_supernovae.sh \ - \ - bindings/ruby_bindings.h - -#LIBRARY_VERSION= 0:0:0 -# | | | -# +------+ | +---+ -# | | | -# current:revision:age -# | | | -# | | +- Increment if interfaces have been added -# | | Set to zero if interfaces have been removed or -# | | changed -# | +- Increment if source code has changed -# | Set to zero if current is incremented -# +- Increment if interfaces have been added, removed or changed - -VERSION_INFO= -version-info 2:0:0 -# from `info libtool "Updating version info"` -# and `info libtool "Release numbers"` -# -# A) For stable library (interface wise), you should use --version-info: -# -# - Begin with C:R:A = 0:0:0 (ie here, VERSION_INFO= -version-info 0:0:0) -# - Do not update it before public release (keep numbers small) -# -# ----------------------------------------------------------------------+ -# + Interface | code of existing | Interface | New version info | -# | removal/change? | interface changed? | addition? | | -# +-----------------+--------------------+-----------+------------------+ -# | yes | must be yes ;) | | C++ : 0 : 0 | -# | no | yes | yes | C : R++ : A++ | -# | no | yes | no | C : R++ : A | -# | no | no | yes | C : R : A++ | -# | no | no | no | C : R : A | -# +-----------------+--------------------+-----------+------------------+ -# -# B) For rapidely changing library, you should go for the -release flag -# -# It modifies the library name, and you thus cannot say that a library -# using this trick is ready for a "stable" release (say, in Debian). - - -################################################ -# Declaration of the different modules content # -################################################ - -XBT_SRC=\ - \ - xbt/snprintf.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.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 \ - xbt/heap.c \ - xbt/fifo.c \ - xbt/swag.c \ - xbt/graph.c \ - xbt/set.c \ - xbt/xbt_matrix.c \ - \ - xbt/xbt_queue.c xbt/xbt_synchro.c \ - \ - xbt/xbt_peer.c \ - \ - xbt/xbt_main.c \ - \ - xbt/config.c \ - xbt/cunit.c \ - xbt/graphxml_parse.c \ - xbt/setset.c \ - xbt/mmalloc/mm.c - -#### mmalloc cruft -- to be integrated into cmake - -EXTRA_DIST+= \ - xbt/mmalloc/keys.c xbt/mmalloc/mmalloc.c \ - xbt/mmalloc/mm.c xbt/mmalloc/mmprivate.h xbt/mmalloc/mrealloc.c \ - xbt/mmalloc/attach.c xbt/mmalloc/mcalloc.c \ - xbt/mmalloc/mmcheck.c xbt/mmalloc/mmstats.c xbt/mmalloc/mvalloc.c \ - xbt/mmalloc/detach.c xbt/mmalloc/mfree.c xbt/mmalloc/mmap-sup.c \ - xbt/mmalloc/mmemalign.c xbt/mmalloc/mmtrace.c xbt/mmalloc/sbrk-sup.c - -# info_TEXINFOS= xbt/mmalloc/mmalloc.texi - -### End of mmalloc cruft - -XBT_RL_SRC = \ - xbt/xbt_rl_synchro.c \ - xbt/xbt_rl_time.c -XBT_SG_SRC = \ - xbt/xbt_sg_synchro.c \ - xbt/xbt_sg_time.c - -SURF_SRC= \ - surf/surf_model.c \ - surf/surf_action.c \ - surf/surf_routing.c \ - surf/surf_config.c \ - surf/maxmin.c \ - surf/fair_bottleneck.c \ - surf/lagrange.c \ - surf/trace_mgr.c \ - surf/random_mgr.c \ - surf/surf.c \ - surf/surfxml_parse.c \ - surf/cpu.c surf/network.c surf/network_constant.c surf/network_vivaldi.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 - -GTNETS_SRC= \ - surf/gtnets/gtnets_simulator.cc \ - surf/gtnets/gtnets_topology.cc \ - surf/gtnets/gtnets_interface.cc \ - surf/network_gtnets.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_network.c \ - simix/smx_context_base.c - -TRACING_SRC=\ - instr/interface.c \ - instr/general.c \ - instr/paje.c \ - instr/msg_task_instr.c \ - instr/msg_process_instr.c \ - instr/smx_instr.c \ - instr/surf_instr.c \ - instr/variables_instr.c - -if CONTEXT_THREADS - SURF_SRC += xbt/xbt_os_thread.c simix/smx_context_thread.c - EXTRA_DIST += simix/smx_context_sysv.c -else - SURF_SRC += simix/smx_context_sysv.c - EXTRA_DIST += xbt/xbt_os_thread.c simix/smx_context_thread.c -endif - -SMPI_SRC= \ - smpi/smpi_base.c \ - smpi/smpi_comm.c \ - smpi/smpi_group.c \ - smpi/smpi_bench.c \ - smpi/smpi_global.c \ - smpi/smpi_mpi.c \ - smpi/smpi_util.c \ - smpi/smpi_coll.c \ - smpi/smpi_mpi_dt.c - -MSG_SRC= msg/msg_config.c \ - msg/task.c msg/host.c msg/m_process.c msg/gos.c \ - msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c \ - msg/msg_actions.c - -JMSG_C_SRC = \ - simix/smx_context_java.c \ - java/jxbt_utilities.c java/jxbt_utilities.h \ - java/jmsg.c java/jmsg.h \ - java/jmsg_host.c java/jmsg_host.h \ - java/jmsg_process.c java/jmsg_process.h \ - java/jmsg_task.c java/jmsg_task.h \ - java/jmsg_application_handler.c java/jmsg_application_handler.h - -JMSG_JAVA_SRC = \ - java/simgrid/msg/MsgException.java \ - java/simgrid/msg/JniException.java \ - java/simgrid/msg/TransferFailureException.java \ - java/simgrid/msg/HostFailureException.java \ - java/simgrid/msg/TimeoutException.java \ - java/simgrid/msg/NativeException.java \ - java/simgrid/msg/HostNotFoundException.java \ - java/simgrid/msg/ProcessNotFoundException.java \ - java/simgrid/msg/TaskCancelledException.java \ - \ - java/simgrid/msg/Msg.java \ - java/simgrid/msg/Process.java \ - java/simgrid/msg/Host.java \ - java/simgrid/msg/Task.java \ - \ - java/simgrid/msg/MsgNative.java \ - java/simgrid/msg/ApplicationHandler.java \ - \ - java/simgrid/msg/Sem.java - - -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 \ - gras/Transport/transport.c gras/Transport/transport_private.h \ - gras/Msg/gras_msg_mod.c gras/Msg/gras_msg_types.c \ - gras/Msg/gras_msg_exchange.c gras/Msg/gras_msg_listener.c \ - gras/Msg/rpc.c gras/Msg/timer.c \ - gras/Msg/msg_interface.h gras/Msg/msg_private.h \ - \ - gras/Virtu/process.c gras/Virtu/gras_module.c \ - \ - gras/DataDesc/ddt_create.c \ - gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \ - gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \ - gras/DataDesc/datadesc_interface.h gras/DataDesc/datadesc_private.h \ - gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c - -GRAS_RL_SRC= \ - gras/rl_stubs.c xbt/xbt_os_thread.c \ - \ - gras/Transport/rl_transport.c \ - gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \ - \ - gras/Virtu/rl_emul.c \ - gras/Virtu/rl_process.c \ - gras/Virtu/rl_dns.c\ - \ - gras/Msg/rl_msg.c - -GRAS_RL_SRC+=$(XBT_RL_SRC) - -GRAS_SG_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ - \ - gras/Virtu/sg_emul.c \ - gras/Virtu/sg_process.c \ - gras/Virtu/sg_dns.c\ - \ - gras/Msg/sg_msg.c - -GRAS_SG_SRC+=$(XBT_SG_SRC) - -AMOK_SRC= \ - amok/amok_base.c \ - amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ - amok/PeerManagement/peermanagement.c - -MC_SRC= \ - mc/mc_memory.c mc/mc_checkpoint.c \ - mc/memory_map.c mc/mc_global.c \ - mc/mc_dfs.c mc/mc_dpor.c \ - mc/mc_transition.c - -############################## -# Deal with optional modules # -############################## - -if HAVE_GTNETS - GTNETS_USED=$(GTNETS_SRC) -else - GTNETS_USED= - EXTRA_DIST+=$(GTNETS_SRC) -endif - -### -### Declare the library content -### - -lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la - -gras_sources=$(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC) -simgrid_sources=$(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \ - $(SIMIX_SRC) $(MC_SRC) $(MSG_SRC) $(SIMDAG_SRC) \ - $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) \ - $(TRACING_SRC) - - -libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm - -libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm -# -Wl,--entry -Wl,simgrid_version - -# 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 - -if HAVE_RUBY -lib_LTLIBRARIES += simgrid_ruby.la -simgrid_ruby_la_LIBADD = libsimgrid.la -simgrid_ruby_la_SOURCES = bindings/ruby/simgrid_ruby.c -simgrid_ruby_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm -module -endif - -# Windows users (at least, MSVC ones) need a def file. (and JNI dont like @ cruft added to symbols) -if IS_WINDOWS -libgras_la_LDFLAGS += -Wl,--output-def,libgras.def -libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def -Wl,--kill-at -libsmpi_la_LDFLAGS += -Wl,--output-def,libsmpi.def -endif - -## -## Java cruft - -EXTRA_DIST+=$(JMSG_JAVA_SRC) - -if HAVE_JAVA -simgrid_sources += $(JMSG_C_SRC) # add the binding support to the library - -clean-local: - -rm -rf .classes simgrid.jar - -jardir = $(prefix)/jar -jar_DATA = simgrid.jar - -simgrid.jar: $(JMSG_JAVA_SRC) - [ -e .classes ] || mkdir .classes - $(JAVAC) -d .classes -source 6 $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file)) - [ -e .classes/surf ] || mkdir .classes/surf - $(JAR) cvf simgrid.jar -C .classes . -else -EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC) $(TRACING_SRC) -endif - -LUA_SRC= simix/smx_context_lua.c bindings/lua/simgrid_lua.c #bindings/lua/Msglua.c -if HAVE_LUA - simgrid_sources += $(LUA_SRC) -else - EXTRA_DIST += $(LUA_SRC) -endif - -RUBY_SRC= simix/smx_context_ruby.c \ - bindings/ruby/rb_msg_process.c \ - bindings/ruby/rb_msg_host.c \ - bindings/ruby/rb_msg_task.c \ - bindings/ruby/rb_application_handler.c -if HAVE_RUBY - simgrid_sources += $(RUBY_SRC) -else - EXTRA_DIST += $(RUBY_SRC) -endif -## -## Compile the libs -CLEANFILES=supernovae_sg.c supernovae_gras.c supernovae_smpi.c -BUILT_SOURCES= - -# Cannot let automake autocompute the content of dist from -# lib*_la_SOURCES variables since it would include supernovae files, -# which are only generated sometimes, not always. -# So, use nodist_lib*_la_SOURCES variables and add stuff to EXTRA_DIST manually - -EXTRA_DIST+=$(simgrid_sources) $(gras_sources) - -if SUPERNOVAE_MODE -simgrid_fragile_sources=gras/DataDesc/ddt_parse.yy.c surf/surfxml_parse.c xbt/graphxml_parse.c simdag/sd_daxloader.c -gras_fragile_sources=gras/DataDesc/ddt_parse.yy.c xbt/graphxml_parse.c -BUILT_SOURCES+=supernovae_sg.c supernovae_gras.c supernovae_smpi.c - -supernovae_sg.c: Makefile.am - @top_srcdir@/src/mk_supernovae.sh supernovae_sg.c $(filter-out $(simgrid_fragile_sources),$(simgrid_sources)) -supernovae_gras.c: Makefile.am - @top_srcdir@/src/mk_supernovae.sh supernovae_gras.c $(filter-out $(gras_fragile_sources),$(gras_sources)) -supernovae_smpi.c: Makefile.am - @top_srcdir@/src/mk_supernovae.sh supernovae_smpi.c $(filter-out $(smpi_fragile_sources),$(smpi_sources)) - -nodist_libsimgrid_la_SOURCES = supernovae_sg.c $(simgrid_fragile_sources) -nodist_libgras_la_SOURCES = supernovae_gras.c $(gras_fragile_sources) -else -nodist_libsimgrid_la_SOURCES = $(simgrid_sources) -nodist_libgras_la_SOURCES = $(gras_sources) -endif - - -if GRAMINE_MODE -else -### -### Testing infrastructure -### - -# Test files must be added both to the TEST_CFILES and TEST_UNITS because -# if I compute TEST_UNITS from TEST_CFILES, automake fails to note that they -# are generated. Sorry about that. - -# If you add a test unit, you should regenerate simgrid_units_main.c from scratch: -# make clean-units ; make testall - -# Suites and tests run in the given order. - -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_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@/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 - -testall_SOURCES= $(TEST_UNITS) @builddir@/simgrid_units_main.c -testall_LDADD=libgras.la -TESTS=testall -TESTS_ENVIRONMENT=$(SG_TEST_EXENV) - -EXTRA_DIST+=$(testall_SOURCES) - -if MAINTAINER_MODE -CLEANFILES+=$(TEST_UNITS) - -$(TEST_UNITS): $(TEST_CFILES) - @top_srcdir@/tools/sg_unit_extractor.pl $^ - -@builddir@/simgrid_units_main.c: $(TEST_UNITS) - @top_srcdir@/tools/sg_unit_extractor.pl @srcdir@/xbt/cunit.c - -clean-units: - rm -f simgrid_units_main.c *_unit.c @srcdir@/simgrid_units_main.c @srcdir@/*_unit.c - for n in $(TEST_UNITS) ; do \ - dep=`echo $$n|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'`; \ - echo "Removing dependency tracker of $$n ($$dep @srcdir@/$$dep)"; \ - rm -vf $$dep @srcdir@/$$dep; touch $$dep; \ - done -else - -if BOTBUILD_MODE -$(TEST_UNITS) simgrid_units_main.c clean-units: - @echo "WARNING: Test units not generated, but touched instead since this is a bot build." - touch $@ -else -$(TEST_UNITS) simgrid_units_main.c clean-units: - @echo "ERROR: Test units not generated." - @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag" - @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." - @exit 1 -endif -endif - -### -### Regenerate what needs to with flex & flexml -### - - -gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l - set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^ - -if MAINTAINER_MODE -surf/simgrid_dtd.c: surf/simgrid_dtd.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 $@ -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 - set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ -$(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd - rm -f $(top_srcdir)/include/surf/simgrid.h - set -e; flexml --root-tags platform -P surfxml --sysid=simgrid.dtd -H $@ -L $^ - if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi - 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 - 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 - @echo "WARNING: src/surf/simgrid.dtd seem to be modified, but the flexml program was not detected" - @echo "WARNING: Please install it if you did modify this file." - @echo "WARNING: For now, I'll ignore the change" - touch $(top_srcdir)/include/surf/simgrid_dtd.h $(top_srcdir)/src/surf/simgrid_dtd.l -$(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graphxml.dtd - @echo "WARNING: src/xbt/graphxml.dtd seem to be modified, but the flexml program was not detected" - @echo "WARNING: Please install it if you did modify this file." - @echo "WARNING: For now, I'll ignore the change" - touch $(top_srcdir)/include/xbt/graphxml.h $(top_srcdir)/src/xbt/graphxml.l" -simdag/dax_dtd.h simdag/dax_dtd.l: simdag/dax.dtd - @echo "WARNING: src/simdag/dax.dtd seem to be modified, but the flexml program was not detected" - @echo "WARNING: Please install it if you did modify this file." - @echo "WARNING: For now, I'll ignore the change" - touch $(top_srcdir)/src/simdag/dax_dtd.h $(top_srcdir)/src/simdag/dax_dtd.l -endif -endif -endif - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/src/amok/Makefile.am b/src/amok/Makefile.am deleted file mode 100644 index 8909524ced..0000000000 --- a/src/amok/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ - - - THIS FILE IS NOT USED. IT SHOULD, AND SHOULD BUILD SHARED PLUGINS - - -INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/include - -EXTRA_DIST = \ - Bandwidth/bandwidth_private.h - -lib_LTLIBRARIES= libamok.la - -libamok_la_SOURCES= \ - base.c \ - Bandwidth/bandwidth.c Bandwidth/saturate.c - -VERSION_INFO= -release 20040722 -version-info 0:0:0 -libamok_la_LDFLAGS = $(VERSION_INFO) - -include $(top_srcdir)/acmacro/dist-files.mk - diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am deleted file mode 100644 index 24f2db11db..0000000000 --- a/teshsuite/Makefile.am +++ /dev/null @@ -1,319 +0,0 @@ -# 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. - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include -AM_CFLAGS = -g $(INCLUDES) - -# Declare all the variables to empty, so that each test set can add -# their content to them -CLEANFILES = -EXTRA_DIST= -noinst_PROGRAMS= - -TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh -TESTS = -XFAIL_TESTS= - -LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la -LDADD_RL=$(abs_top_builddir)/src/libgras.la - -################# -### XBT tests ### -################# - - ## Try large logs ## - #################### - -TESTS += xbt/log_large_test.tesh -noinst_PROGRAMS += xbt/log_large_test -xbt_log_large_test_LDADD = $(LDADD_SG) - - ## Try parallel logs ## - ####################### - -TESTS += xbt/parallel_log_crashtest.tesh -noinst_PROGRAMS += xbt/parallel_log_crashtest -xbt_parallel_log_crashtest_LDADD = $(LDADD_RL) - -################## -### GRAS tests ### -################## - - ## Try structured communication facilities ## - ############################################# - -CLEANFILES += gras/datadesc/datadesc_usage.out -EXTRA_DIST += \ - gras/datadesc/datadesc.little32_4 \ - gras/datadesc/datadesc.little64\ - gras/datadesc/datadesc.big32_8 gras/datadesc/datadesc.big32_8_4 gras/datadesc/datadesc.big32_2 \ - gras/datadesc/mk_datadesc_structs.pl -TESTS += \ - gras/datadesc/datadesc_mem.tesh \ - gras/datadesc/datadesc_rw.tesh \ - gras/datadesc/datadesc_r_little32_4.tesh \ - gras/datadesc/datadesc_r_little64.tesh \ - \ - gras/datadesc/datadesc_r_big32_8.tesh \ - gras/datadesc/datadesc_r_big32_8_4.tesh \ - gras/datadesc/datadesc_r_big32_2.tesh -# Data sets still to regenerate: -XFAIL_TESTS+= \ - gras/datadesc/datadesc_r_little32.tesh \ - gras/datadesc/datadesc_r_big32_8.tesh \ - gras/datadesc/datadesc_r_big32_2.tesh - -noinst_PROGRAMS += gras/datadesc/datadesc_usage -gras_datadesc_datadesc_usage_SOURCES= gras/datadesc/datadesc_usage.c gras/datadesc/datadesc_structs.c -gras_datadesc_datadesc_usage_LDADD= $(LDADD_RL) - -gras/datadesc/datadesc_structs.c: gras/datadesc/mk_datadesc_structs.pl; \ - perl $(top_srcdir)/teshsuite/gras/datadesc/mk_datadesc_structs.pl > $@ - - ## Ensures the gras_msg_handle semantic ## - ########################################## -EXTRA_DIST += gras/msg_handle/msg_handle.xml \ - gras/msg_handle/test_rl \ - gras/msg_handle/test_sg_32 gras/msg_handle/test_sg_64 -noinst_PROGRAMS+=\ - gras/msg_handle/msg_handle_client \ - gras/msg_handle/msg_handle_server \ - gras/msg_handle/msg_handle_simulator - -gras_msg_handle_msg_handle_simulator_SOURCES= gras/msg_handle/msg_handle.c gras/msg_handle/_msg_handle_simulator.c -gras_msg_handle_msg_handle_client_SOURCES= gras/msg_handle/msg_handle.c gras/msg_handle/_msg_handle_client.c -gras_msg_handle_msg_handle_server_SOURCES= gras/msg_handle/msg_handle.c gras/msg_handle/_msg_handle_server.c - -gras_msg_handle_msg_handle_simulator_LDADD= $(LDADD_SG) -gras_msg_handle_msg_handle_client_LDADD= $(LDADD_RL) -gras_msg_handle_msg_handle_server_LDADD= $(LDADD_RL) - -gras/msg_handle/_msg_handle_simulator.c gras/msg_handle/_msg_handle_client.c gras/msg_handle/_msg_handle_server.c : gras/msg_handle/msg_handle.c gras/msg_handle/msg_handle.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@; \ - mkdir -p gras/msg_handle; \ - cd gras/msg_handle;\ - $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ msg_handle $(abs_top_srcdir)/teshsuite/gras/msg_handle/msg_handle.xml - - -if GRAS_ARCH_32_BITS - TESTS += gras/msg_handle/test_rl gras/msg_handle/test_sg_32 -else - TESTS += gras/msg_handle/test_rl gras/msg_handle/test_sg_64 -endif - - ## Make sure it's ok to have empty main functions ## - #################################################### -EXTRA_DIST += gras/empty_main/empty_main.xml \ - gras/empty_main/test_rl gras/empty_main/test_sg -noinst_PROGRAMS+=\ - gras/empty_main/empty_main_function \ - gras/empty_main/empty_main_simulator - -gras_empty_main_empty_main_simulator_SOURCES= gras/empty_main/empty_main.c gras/empty_main/_empty_main_simulator.c -gras_empty_main_empty_main_function_SOURCES= gras/empty_main/empty_main.c gras/empty_main/_empty_main_function.c - -gras_empty_main_empty_main_simulator_LDADD= $(LDADD_SG) -gras_empty_main_empty_main_function_LDADD= $(LDADD_RL) - -gras/empty_main/_empty_main_simulator.c gras/empty_main/_empty_main_function.c : gras/empty_main/empty_main.c gras/empty_main/empty_main.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ ; \ - mkdir -p gras/empty_main; \ - cd gras/empty_main;\ - $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ empty_main $(abs_top_srcdir)/teshsuite/gras/empty_main/empty_main.xml - -TESTS += gras/empty_main/test_rl gras/empty_main/test_sg - - ## Make sure it's ok to have very small sleeps (not meant for real life) ## - ########################################################################### -EXTRA_DIST += gras/small_sleep/small_sleep.xml \ - gras/small_sleep/test_sg_32 gras/small_sleep/test_sg_64 -noinst_PROGRAMS+=\ - gras/small_sleep/small_sleep_function \ - gras/small_sleep/small_sleep_simulator - -gras_small_sleep_small_sleep_simulator_SOURCES= gras/small_sleep/small_sleep.c gras/small_sleep/_small_sleep_simulator.c -gras_small_sleep_small_sleep_function_SOURCES= gras/small_sleep/small_sleep.c gras/small_sleep/_small_sleep_function.c - -gras_small_sleep_small_sleep_simulator_LDADD= $(LDADD_SG) -gras_small_sleep_small_sleep_function_LDADD= $(LDADD_RL) - -gras/small_sleep/_small_sleep_simulator.c gras/small_sleep/_small_sleep_function.c : gras/small_sleep/small_sleep.c gras/small_sleep/small_sleep.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@; \ - mkdir -p gras/small_sleep; \ - cd gras/small_sleep;\ - $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ small_sleep $(abs_top_srcdir)/teshsuite/gras/small_sleep/small_sleep.xml - -if GRAS_ARCH_32_BITS - TESTS += gras/small_sleep/test_sg_32 -else - TESTS += gras/small_sleep/test_sg_64 -endif - -############# -# MSG tests # -############# - -noinst_PROGRAMS += msg/get_sender -EXTRA_DIST += msg/get_sender.xml \ - msg/get_sender.tesh -msg_get_sender_SOURCES = msg/get_sender.c -msg_get_sender_LDADD = $(LDADD_SG) -TESTS += msg/get_sender.tesh - -################################### -# network model test via SimDag API -################################### - -# misc tests - -noinst_PROGRAMS += simdag/network/test_reinit_costs -EXTRA_DIST += simdag/network/platform_2p_1sl.xml -simdag_network_test_reinit_costs_SOURCES = simdag/network/test_reinit_costs.c -simdag_network_test_reinit_costs_LDADD = $(LDADD_SG) -TESTS += \ - simdag/network/test_reinit_costs.tesh - -noinst_PROGRAMS += simdag/platforms/basic_parsing_test -simdag_platforms_basic_parsing_test_SOURCES = simdag/platforms/basic_parsing_test.c -simdag_platforms_basic_parsing_test_LDADD = $(LDADD_SG) -TESTS += simdag/platforms/basic_parsing_test.tesh -XFAIL_TESTS += simdag/platforms/basic_parsing_test_failing.tesh - -noinst_PROGRAMS += simdag/platforms/flatifier -simdag_platforms_flatifier_SOURCES = simdag/platforms/flatifier.c -simdag_platforms_flatifier_LDADD = $(LDADD_SG) -TESTS += simdag/platforms/flatifier.tesh -XFAIL_TESTS += simdag/platforms/flatifier.tesh - -EXTRA_DIST += simdag/platforms/one_cluster_foreach.xml \ - simdag/platforms/one_cluster_one_host_random.xml \ - simdag/platforms/one_cluster_one_host.xml \ - simdag/platforms/one_cluster_properties_foreach.xml \ - simdag/platforms/one_cluster_properties_override.xml \ - simdag/platforms/one_cluster.xml \ - simdag/platforms/one_host_availability.xml \ - simdag/platforms/one_host_properties.xml \ - simdag/platforms/one_host_state_file.xml \ - simdag/platforms/one_host_state_off.xml \ - simdag/platforms/one_host_state_on.xml \ - simdag/platforms/one_host_trace_file.xml \ - simdag/platforms/one_host_trace_inside.xml \ - simdag/platforms/one_host.xml \ - simdag/platforms/one_link_availability.xml \ - simdag/platforms/one_link_fatpipe.xml \ - simdag/platforms/one_link_shared.xml \ - simdag/platforms/one_link_state_file.xml \ - simdag/platforms/route_override.xml \ - simdag/platforms/three_hosts_non_symmetric_route.xml \ - simdag/platforms/two_clusters_symmetric.xml \ - simdag/platforms/two_clusters.xml \ - simdag/platforms/two_hosts_multi_hop.xml \ - simdag/platforms/two_hosts_one_link.xml \ - simdag/platforms/bob.fail \ - simdag/platforms/bob.trace \ - simdag/platforms/link1.bw \ - simdag/platforms/link1.fail \ - simdag/platforms/link1.lat - -# from L.C. Canon -noinst_PROGRAMS += simdag/basic0 \ - simdag/basic1 \ - simdag/basic2 \ - simdag/basic3 \ - simdag/basic4 \ - simdag/basic5 \ - simdag/basic6 - -EXTRA_DIST += simdag/basic_platform.xml - -simdag_basic0_SOURCES = simdag/basic0.c -simdag_basic0_LDADD = $(LDADD_SG) -simdag_basic1_SOURCES = simdag/basic1.c -simdag_basic1_LDADD = $(LDADD_SG) -simdag_basic2_SOURCES = simdag/basic2.c -simdag_basic2_LDADD = $(LDADD_SG) -simdag_basic3_SOURCES = simdag/basic3.c -simdag_basic3_LDADD = $(LDADD_SG) -simdag_basic4_SOURCES = simdag/basic4.c -simdag_basic4_LDADD = $(LDADD_SG) -simdag_basic5_SOURCES = simdag/basic5.c -simdag_basic5_LDADD = $(LDADD_SG) -simdag_basic6_SOURCES = simdag/basic6.c -simdag_basic6_LDADD = $(LDADD_SG) - -TESTS += \ - simdag/basic0.tesh \ - simdag/basic1.tesh \ - simdag/basic2.tesh \ - simdag/basic3.tesh \ - simdag/basic4.tesh \ - simdag/basic5.tesh \ - simdag/basic6.tesh - -# p2p - -noinst_PROGRAMS += simdag/network/p2p/test_latency1 \ - simdag/network/p2p/test_latency2 \ - simdag/network/p2p/test_latency3 \ - simdag/network/p2p/test_latency_bound - -EXTRA_DIST += simdag/network/p2p/platform_2p_1sl.xml \ - simdag/network/p2p/platform_2p_1fl.xml \ - simdag/network/p2p/platform_2p_1switch.xml \ - simdag/network/p2p/platform_2p_1bb.xml - -simdag_network_p2p_test_latency1_SOURCES = simdag/network/p2p/test_latency1.c -simdag_network_p2p_test_latency1_LDADD = $(LDADD_SG) -simdag_network_p2p_test_latency2_SOURCES = simdag/network/p2p/test_latency2.c -simdag_network_p2p_test_latency2_LDADD = $(LDADD_SG) -simdag_network_p2p_test_latency3_SOURCES = simdag/network/p2p/test_latency3.c -simdag_network_p2p_test_latency3_LDADD = $(LDADD_SG) -simdag_network_p2p_test_latency_bound_SOURCES = simdag/network/p2p/test_latency_bound.c -simdag_network_p2p_test_latency_bound_LDADD = $(LDADD_SG) - -TESTS += \ - simdag/network/p2p/test_latency1.tesh \ - simdag/network/p2p/test_latency2.tesh \ - simdag/network/p2p/test_latency3.tesh \ - simdag/network/p2p/test_latency_bound.tesh - -# m x n tests - -noinst_PROGRAMS += simdag/network/mxn/test_intra_all2all \ - simdag/network/mxn/test_intra_independent_comm \ - simdag/network/mxn/test_intra_scatter - -EXTRA_DIST += simdag/network/mxn/platform_4p_1switch.xml - -simdag_network_mxn_test_intra_all2all_SOURCES = simdag/network/mxn/test_intra_all2all.c -simdag_network_mxn_test_intra_all2all_LDADD = $(LDADD_SG) -simdag_network_mxn_test_intra_independent_comm_SOURCES = simdag/network/mxn/test_intra_independent_comm.c -simdag_network_mxn_test_intra_independent_comm_LDADD = $(LDADD_SG) -simdag_network_mxn_test_intra_scatter_SOURCES = simdag/network/mxn/test_intra_scatter.c -simdag_network_mxn_test_intra_scatter_LDADD = $(LDADD_SG) - -TESTS += \ - simdag/network/mxn/test_intra_all2all.tesh \ - simdag/network/mxn/test_intra_independent_comm.tesh \ - simdag/network/mxn/test_intra_scatter.tesh - -# testing parallel tasks - -noinst_PROGRAMS += simdag/partask/test_comp_only_seq \ - simdag/partask/test_comp_only_par - -EXTRA_DIST += simdag/partask/platform_2p_1sl_hetero.xml \ - simdag/partask/platform_2p_1sl.xml - -simdag_partask_test_comp_only_seq_SOURCES = simdag/partask/test_comp_only_seq.c -simdag_partask_test_comp_only_seq_LDADD = $(LDADD_SG) -simdag_partask_test_comp_only_par_SOURCES = simdag/partask/test_comp_only_par.c -simdag_partask_test_comp_only_par_LDADD = $(LDADD_SG) - -TESTS += \ - simdag/partask/test_comp_only_seq.tesh \ - simdag/partask/test_comp_only_par.tesh - -EXTRA_DIST+=$(TESTS) -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am deleted file mode 100644 index ce548f845a..0000000000 --- a/testsuite/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -# 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. - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include -AM_CFLAGS=-g - -CLEANFILES = *~ test a.out *.o testgraph.xml testgraph.dot -DISTCLEANFILES = gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* simdag/.libs/* - -EXTRA_DIST=run_tests.in \ - xbt/graph.xml \ - surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml\ - simdag/availability_tremblay.txt simdag/small_platform_variable.xml - -# Test stuff - -xbt_tests = \ - xbt/log_usage \ - xbt/heap_bench \ - xbt/graphxml_usage - -SG_tests = \ - surf/maxmin_bench surf/lmm_usage \ - surf/trace_usage surf/surf_usage surf/surf_usage2 - -simdag_tests = simdag/sd_test - -check_PROGRAMS = $(xbt_tests) $(SG_tests) $(simdag_tests) -check_SCRIPTS = run_tests -TESTS=run_tests - -test: $(noinst_PROGRAMS) $(noinst_SCRIPTS) - ./run_tests -valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS) - ./run_tests valgrind - -# LDADD_UTILS is still a separate var to distinguish core tester from RL tester -LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la -LDADD_RL=$(abs_top_builddir)/src/libgras.la - -xbt_log_usage_LDADD= $(LDADD_RL) - -xbt_heap_bench_LDADD= $(LDADD_RL) - -xbt_graphxml_usage_LDADD= $(LDADD_SG) - - -surf_maxmin_bench_LDADD= $(LDADD_SG) -surf_lmm_usage_LDADD= $(LDADD_SG) -surf_trace_usage_LDADD= $(LDADD_SG) -surf_surf_usage_LDADD= $(LDADD_SG) -surf_surf_usage2_LDADD= $(LDADD_SG) - -simdag_sd_test_LDADD= $(LDADD_SG) - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index de2047a9a4..0000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# 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. - -SUBDIRS=gras tesh -#tesh2 -include $(top_srcdir)/acmacro/dist-files.mk -if GRAMINE_MODE -else -EXTRA_DIST= simgrid_update_xml.pl graspe-master sg_unit_extractor.pl -endif diff --git a/tools/gras/Makefile.am b/tools/gras/Makefile.am deleted file mode 100644 index d15b730666..0000000000 --- a/tools/gras/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# 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 = -g3 - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include -I$(top_srcdir)/src - -EXTRA_DIST = gras_stub_generator.h -bin_PROGRAMS = gras_stub_generator -# skel_rewriter - -gras_stub_generator_SOURCES = stub_generator.c unix_stub_generator.c windows_stub_generator.c -gras_stub_generator_LDADD = $(top_builddir)/src/libsimgrid.la - -# skel_rewriter_SOURCES = skel_rewriter.c -# skel_rewriter_LDADD = $(top_builddir)/src/libsimgrid.la - -$(top_builddir)/src/libsimgrid.la: - make -C $(top_builddir)/src libsimgrid.la - -include $(top_srcdir)/acmacro/dist-files.mk diff --git a/tools/tesh/Makefile.am b/tools/tesh/Makefile.am deleted file mode 100644 index fdb844a0a0..0000000000 --- a/tools/tesh/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# 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 = -g - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include -I$(top_srcdir)/src - -bin_PROGRAMS = tesh - -tesh_SOURCES = run_context.c run_context.h tesh.c tesh.h signal.c -tesh_LDADD = $(top_builddir)/src/libgras.la - -TESTS_ENVIRONMENT=./tesh -TESTS=basic.tesh cd.tesh \ - IO-broken-pipe.tesh IO-orders.tesh IO-bigsize.tesh \ - set-return.tesh set-signal.tesh set-timeout.tesh set-ignore-output.tesh\ - catch-return.tesh catch-signal.tesh catch-timeout.tesh \ - catch-wrong-output.tesh \ - bg-basic.tesh bg-set-signal.tesh background.tesh -EXTRA_DIST=$(TESTS) - -$(top_builddir)/src/libsimgrid.la: - make -C $(top_builddir)/src libsimgrid.la - -include $(top_srcdir)/acmacro/dist-files.mk