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 348644e..89c3558 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,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 \
@@ -52,7 +52,7 @@ EXTRA_DIST= \
        gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
        \
        amok/Bandwidth/bandwidth_private.h
-               
+
 #        gras_private.h
 
 #LIBRARY_VERSION= 0:0:0
@@ -103,7 +103,8 @@ COMMON_SRC=\
   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                                                           \
@@ -147,7 +148,6 @@ 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 \
@@ -162,10 +162,8 @@ SG_SRC=  \
 AMOK_SRC= \
   amok/base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c
-        
-                        
 
-BUILT_SOURCES=include/surf/surfxml.h surf/surfxml.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
@@ -177,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"
@@ -193,10 +189,10 @@ endif
 endif
 
 libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
-libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm
+libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
 libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
-libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm
+libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
 
 include $(top_srcdir)/acmacro/dist-files.mk