Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Let's declare that the library is stable (interface wise)
[simgrid.git] / src / Makefile.am
index 883984c..68941cc 100644 (file)
@@ -16,6 +16,7 @@ EXTRA_DIST= \
         \
        portable.h \
        \
+        xbt/mallocator_private.h \
        xbt/dynar_private.h \
         xbt/dict_private.h \
         xbt/heap_private.h \
@@ -77,7 +78,7 @@ EXTRA_DIST= \
 #          |           Set to zero if current is incremented
 #          +- Increment if interfaces have been added, removed or changed
 
-VERSION_INFO= -release 20050627 -version-info 0:0:0
+VERSION_INFO= -version-info 0:0:0
 # from `info libtool "Updating version info"` 
 # and  `info libtool "Release numbers"` 
 #
@@ -115,6 +116,7 @@ COMMON_SRC=\
   xbt/sysdep.c                                                               \
   xbt/asserts.c                                                              \
   xbt/log.c         xbt/log_default_appender.c                               \
+  xbt/mallocator.c                                                           \
   xbt/dynar.c                                                                \
   xbt/dict.c        xbt/dict_elm.c               xbt/dict_cursor.c           \
   xbt/dict_multi.c                                                           \
@@ -196,7 +198,7 @@ AMOK_SRC= \
 # are generated. Sorry about that.
 
 # If you add a test unit, you should regenerate simgrid_units_main.c from scratch:
-# rm -f simgrid_units_main.c *_unit.c ; make testall
+# make clean-units ; make testall
 
 # Suites and tests run in the given order.
 
@@ -235,10 +237,14 @@ config_unit.c: xbt/config.c
        @top_srcdir@/tools/sg_unit_extractor.pl $^
 
 simgrid_units_main.c: $(TEST_UNITS)
+       @top_srcdir@/tools/sg_unit_extractor.pl xbt/cunit.c
+
+clean-units:
+       rm -f simgrid_units_main.c *_unit.c
 
 else
 
-$(TEST_UNITS) simgrid_units_main.c: 
+$(TEST_UNITS) simgrid_units_main.c clean-units
        @echo "ERROR: Test units not generated."
        @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag"
        @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
@@ -262,14 +268,14 @@ xbt/graphxml.c: xbt/graphxml.l
 
 if HAVE_FLEXML
 surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
-       set -e; mkdir -p surf; flexml -b 1000000 -P surfxml -S $@ -L $^
+       set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
 $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
-       set -e;                flexml            -P surfxml -H $@ -L $^
-       
+       set -e;                flexml            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+
 xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
-       set -e; flexml -b 1000000 -P graphxml -S $@ -L $^
+       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 -H $@ -L $^
+       set -e; flexml            -P graphxml --sysid=graphxml.dtd -H $@ -L $^
 else
 
 $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd
@@ -290,10 +296,10 @@ endif
 ###
 
 libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
-libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
+libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
 libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
-libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm