moving public parts to public places and generating things to the right places

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f820827..89c3558 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS= . amok
-
 AM_CFLAGS= -g
 #AM_CFLAGS= -DNDEBUG 
 
@@ -41,7 +39,7 @@ EXTRA_DIST= \
        include/surf/maxmin.h \
        include/surf/trace_mgr.h \
        include/surf/surf.h \
-       include/surf/surf_parse.h \
+       include/surf/surf_parse_private.h \
        \
        include/xbt/xbt_portability.h \
        include/xbt/context.h \
@@ -51,8 +49,9 @@ EXTRA_DIST= \
        gras/Transport/transport_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
-
+       gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
+       \
+       amok/Bandwidth/bandwidth_private.h
 
 #        gras_private.h
 
@@ -97,11 +96,15 @@ VERSION_INFO= -release 20050627 -version-info 0:0:0
 lib_LTLIBRARIES= libsimgrid.la libgras.la
 
 COMMON_SRC=\
+  \
+  xbt/snprintf.c                                                             \
+  xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
   \
   xbt/sysdep.c                                                               \
-  xbt/log.c         xbt/log_default_appender.c   xbt/error.c                 \
+  xbt/asserts.c                                                              \
+  xbt/log.c         xbt/log_default_appender.c                               \
   xbt/dynar.c                                                                \
   xbt/dict.c        xbt/dict_elm.c               xbt/dict_cursor.c           \
   xbt/dict_multi.c                                                           \
@@ -145,8 +148,8 @@ SG_SRC=  \
   surf/surf_timer.c                                                               \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \
-  include/surf/surfxml.h \
   \
+  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  \
   \
@@ -156,7 +159,11 @@ SG_SRC=  \
   gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
   gras/Virtu/sg_dns.c
 
-BUILT_SOURCES=include/surf/surfxml.h surf/surfxml.c \
+AMOK_SRC= \
+  amok/base.c \
+  amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.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
@@ -168,14 +175,12 @@ surf/surfxml.c: surf/surfxml.l
 
 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
+       set -e; cd surf; flexml -b 1000000 -S -L surfxml.dtd
+../include/surf/surfxml.h: surf/surfxml.dtd
+       cd ../include/surf; flexml -H -L ../../src/surf/surfxml.dtd
 else
 
-include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
+../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"
@@ -183,11 +188,11 @@ include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
 endif
 endif
 
-libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC)
-libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm
+libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
+libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
-libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
-libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm
+libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
+libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
 
 include $(top_srcdir)/acmacro/dist-files.mk