X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f254a9bcba572207bc1487e0c828edc5f79d52e..3d85805182365568b827d198e52c9463a946ec74:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 03a5e473f4..1b9502b831 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,8 +13,7 @@ AM_CFLAGS= -g MAINTAINERCLEANFILES=Makefile.in -INCLUDES= -I$(top_srcdir)/include \ - @CFLAGS_SimGrid@ +INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include EXTRA_DIST= \ \ portable.h \ @@ -29,16 +28,29 @@ EXTRA_DIST= \ surf/surf_private.h \ surf/cpu_private.h \ surf/workstation_private.h \ - surf/surf_parse.l surf/surf_parse.h \ + surf/surf_parse.c \ + surf/surfxml.l \ + surf/surfxml.c \ + surf/surfxml.dtd \ surf/network_private.h \ + surf/network_dassf_private.h \ + surf/workstation_KCCFLN05_private.h \ + \ + include/surf/maxmin.h \ + include/surf/trace_mgr.h \ + include/surf/surf.h \ + include/surf/surf_parse.h \ + \ + include/xbt/xbt_portability.h \ + include/xbt/context.h \ \ msg/private.h \ \ gras/Transport/transport_interface.h \ - gras/Virtu/virtu_interface.h \ - gras/Virtu/virtu_rl.h \ - gras/Virtu/virtu_sg.h \ - gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c + gras/Virtu/virtu_interface.h gras/Virtu/virtu_private.h\ + gras/Virtu/virtu_rl.h gras/Virtu/virtu_sg.h \ + gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c + # gras_private.h @@ -55,7 +67,7 @@ EXTRA_DIST= \ # | Set to zero if current is incremented # +- Increment if interfaces have been added, removed or changed -VERSION_INFO= -release 20040722 -version-info 0:0:0 +VERSION_INFO= -release 20050131 -version-info 0:0:0 # from `info libtool "Updating version info"` # and `info libtool "Release numbers"` # @@ -80,14 +92,9 @@ VERSION_INFO= -release 20040722 -version-info 0:0:0 # 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). -if HAVE_SG - lib_LTLIBRARIES= libgrasrl.la libgrassg.la -else - lib_LTLIBRARIES= libgrasrl.la -endif +lib_LTLIBRARIES= libsimgrid.la libgras.la - -COMMON_S=\ +COMMON_SRC=\ \ xbt_modinter.h gras_modinter.h \ \ @@ -101,15 +108,6 @@ COMMON_S=\ xbt/set.c \ xbt/module.c \ xbt/config.c \ - xbt/context.c \ - \ - surf/maxmin.c \ - surf/trace_mgr.c \ - surf/surf.c \ - surf/surf_parse.c \ - surf/cpu.c surf/network.c surf/workstation.c \ - \ - msg/task.c \ \ gras/gras.c \ \ @@ -121,26 +119,71 @@ COMMON_S=\ gras/DataDesc/datadesc_interface.h gras/DataDesc/datadesc_private.h \ gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h \ \ - gras/Msg/msg.c gras/Msg/msg_interface.h gras/Msg/msg_private.h \ + gras/Msg/msg.c gras/Msg/timer.c \ + gras/Msg/msg_interface.h gras/Msg/msg_private.h \ \ gras/Virtu/process.c +RL_SRC= \ + gras/Transport/rl_transport.c gras/Transport/transport_plugin_tcp.c gras/Transport/transport_plugin_file.c \ + \ + gras/Virtu/rl_emul.c \ + gras/Virtu/rl_process.c gras/Virtu/rl_time.c \ + gras/Virtu/rl_dns.c + +SG_SRC= \ + xbt/context.c \ + \ + surf/maxmin.c \ + surf/trace_mgr.c \ + surf/surf.c \ + surf/surf_parse.c \ + surf/cpu.c surf/network.c surf/workstation.c \ + surf/network_dassf.c \ + surf/workstation_KCCFLN05.c \ + include/surf/surfxml.h \ + \ + msg/task.c msg/host.c msg/m_process.c msg/gos.c \ + msg/global.c msg/environment.c msg/deployment.c \ + \ + gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ + \ + gras/Virtu/sg_emul.c \ + gras/Virtu/sg_process.c gras/Virtu/sg_time.c \ + gras/Virtu/sg_dns.c + +BUILT_SOURCES=include/surf/surfxml.h surf/surfxml.c \ + gras/DataDesc/ddt_parse.yy.c + gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l @LEX@ -o$@ -Pgras_ddt_parse_ $^ -surf/surf_parse.c: surf/surf_parse.l +if MAINTAINER_MODE +surf/surfxml.c: surf/surfxml.l @LEX@ -o$@ -Psurf_parse_ $^ -libgrasrl_la_SOURCES= $(COMMON_S) \ - gras/Transport/rl_transport.c gras/Transport/transport_plugin_tcp.c gras/Transport/transport_plugin_file.c \ - \ - gras/Virtu/rl_process.c gras/Virtu/rl_time.c gras/Virtu/rl_conditional.c -libgrasrl_la_LDFLAGS = $(VERSION_INFO) @GRAS_RL_DEP@ - -if HAVE_SG - libgrassg_la_SOURCES= $(COMMON_S) \ - gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ - \ - gras/Virtu/sg_process.c gras/Virtu/sg_time.c gras/Virtu/sg_conditional.c - libgrassg_la_LDFLAGS = $(VERSION_INFO) @GRAS_SG_DEP@ +if HAVE_FLEXML +surf/surfxml.l: surf/surfxml.dtd + set -e; cd surf; flexml -b 1000000 -S -L surfxml.dtd ; \ + mv surfxml.l surfxml.l.bak ; \ + sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.l.bak > surfxml.l +include/surf/surfxml.h: surf/surfxml.dtd + cd include/surf; flexml -H -L ../../surf/surfxml.dtd +else + +include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd + @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected" + @echo "ERROR: Please install it, or if you didn't modify this file, try this:" + @echo "ERROR: touch src/include/surf/surfxml.h src/surf/surfxml.l" + @exit 1 +endif endif + +libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) +libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm + +libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) +libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm + + +include $(top_srcdir)/acmacro/dist-files.mk