Add log layouts and xbt/str tests

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0b9ac73..c38ae6b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS+= -g 
+AM_CFLAGS+= -g @GTNETS_CFLAGS@
 #AM_CFLAGS= -DNDEBUG 
 
 # -DNLOG   cuts absolutely all logs at compilation time.
@@ -116,14 +116,15 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la
 
 COMMON_SRC=\
   \
-  xbt/snprintf.c    xbt/getline.c      xbt/xbt_str.c                        \
+  xbt/snprintf.c    xbt/xbt_str.c                                            \
   xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
   \
   xbt/sysdep.c                                                               \
   xbt/asserts.c                                                              \
-  xbt/log.c         xbt/log_default_appender.c                               \
+  xbt/log.c                    xbt/xbt_log_appender_file.c                   \
+  xbt/xbt_log_layout_simple.c  xbt/xbt_log_layout_format.c                   \
   xbt/mallocator.c                                                           \
   xbt/dynar.c                                                                \
   xbt/dict.c        xbt/dict_elm.c               xbt/dict_cursor.c           \
@@ -180,8 +181,22 @@ SG_SRC=  \
   simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c                       \
   simdag/sd_workstation.c
 
+GTNETS_SRC= \
+  surf/gtnets/gtnets_simulator.cc \
+  surf/gtnets/gtnets_topology.cc  \
+  surf/gtnets/gtnets_interface.cc \
+  surf/network_gtnets.c
+
+if USE_GTNETS
+  SG_SRC+=$(GTNETS_SRC)
+else
+  EXTRA_DIST+=$(GTNETS_SRC)
+endif
+
 if HAVE_SDP
-  SG_SRC+= surf/sdp.c  
+  SG_SRC+= surf/sdp.c
+else 
+  EXTRA_DIST+=surf/sdp.c
 endif
 
 SIMIX_SRC= \
@@ -285,10 +300,12 @@ else
 noinst_PROGRAMS=testall
 TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
             xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
-            xbt/config.c
+           xbt/xbt_str.c                      \
+            xbt/config.c 
 TEST_UNITS= ./cunit_unit.c ./ex_unit.c         \
             ./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \
-            ./config_unit.c
+           ./xbt_str_unit.c \
+            ./config_unit.c 
 
 BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
               ../include/xbt/graphxml.h xbt/graphxml.c \
@@ -306,6 +323,8 @@ if MAINTAINER_MODE
        @top_srcdir@/tools/sg_unit_extractor.pl $^
 ./ex_unit.c: xbt/ex.c
        @top_srcdir@/tools/sg_unit_extractor.pl $^
+./xbt_str_unit.c: xbt/xbt_str.c
+       @top_srcdir@/tools/sg_unit_extractor.pl $^
 ./dynar_unit.c: xbt/dynar.c
        @top_srcdir@/tools/sg_unit_extractor.pl $^
 ./dict_unit.c: xbt/dict.c
@@ -382,10 +401,10 @@ libgras_la_SOURCES= $(COMMON_SRC) $(RL_SIMIX_SRC) $(AMOK_SRC)
 else
 libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
 endif
-libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
+libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
 libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
-libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm