Relocate connected socket macros in Windows configuration file win32/config.h.

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 68941cc..03c370d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,6 @@ VERSION_INFO= -version-info 0:0:0
 #   using this trick is ready for a "stable" release (say, in Debian).
 
 lib_LTLIBRARIES= libsimgrid.la libgras.la
-noinst_PROGRAMS=testall
 
 COMMON_SRC=\
   \
@@ -189,6 +188,8 @@ AMOK_SRC= \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
   amok/PeerManagement/peermanagement.c
 
+if GRAMINE_MODE
+else 
 ###
 ### Testing infrastructure
 ###
@@ -202,6 +203,7 @@ AMOK_SRC= \
 
 # Suites and tests run in the given order.
 
+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
@@ -258,13 +260,13 @@ endif
 
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
-       set -e;@LEX@ -o$@ -Pgras_ddt_parse_ $^
+       set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^
 
 if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
-       set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ $^
+       set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^
 xbt/graphxml.c: xbt/graphxml.l
-       set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ $^
+       set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^
 
 if HAVE_FLEXML
 surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
@@ -290,6 +292,7 @@ $(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graph
        @exit 1
 endif
 endif
+endif
 
 ###
 ### Declare the library content