mv include/xbt/context.h src/include/xbt/context.h since users shouldn't mess with it

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3d46526..f5f0223 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS= -g
 
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES= -I$(top_srcdir)/include 
+INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include 
 EXTRA_DIST= \
         \
        portable.h \
@@ -33,16 +33,22 @@ EXTRA_DIST= \
        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/context.h \
+       \
        msg/private.h \
        \
        gras/Transport/transport_interface.h \
-       gras/Virtu/virtu_interface.h \
+       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 \
-       \
-       modules.doc
+       gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c
 
 
 #        gras_private.h
@@ -60,7 +66,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"` 
 #
@@ -87,7 +93,7 @@ VERSION_INFO= -release 20040722 -version-info 0:0:0
 
 lib_LTLIBRARIES= libsimgrid.la libgras.la
 
-COMMON_S=\
+COMMON_SRC=\
   \
   xbt_modinter.h    gras_modinter.h                                            \
   \
@@ -108,7 +114,9 @@ COMMON_S=\
   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  \
@@ -123,15 +131,27 @@ 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_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
+
+SG_SRC=  \
+  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 
+
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
        @LEX@ -o$@ -Pgras_ddt_parse_ $^
 
 surf/surf_parse.c: surf/surfxml.c
 
+if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
        @LEX@ -o$@ -Psurf_parse_ $^
 
@@ -140,15 +160,12 @@ surf/surfxml.l: surf/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
+endif
 
-libgras_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
+libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC)
 libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@
 
-libsimgrid_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
+libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@