get ride of the testing to XML, since SG is now compiled without it

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@213 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/alnem/Makefile.am b/examples/alnem/Makefile.am
index 67786f0..bf14c56 100644 (file)
--- a/examples/alnem/Makefile.am
+++ b/examples/alnem/Makefile.am
@@ -1,6 +1,6 @@
 DISTCLEANFILES=Makefile.in
 INCLUDES= -I$(top_srcdir)/src/include
-#-I../../src -I../../nws_portability/Include @CFLAGS_XML@ @CFLAGS_SimGrid@
+#-I../../src -I../../nws_portability/Include @CFLAGS_SimGrid@
 
 noinst_PROGRAMS=alnem_simulator alnem_sensor alnem_maestro 
 
@@ -9,12 +9,12 @@ alnem_sensor_SOURCES=         _alnem_sensor.c    alnem.c
 alnem_maestro_SOURCES=        _alnem_maestro.c   alnem.c
 
 
-alnem_simulator_LDADD=   $(top_srcdir)/src/base/libgrassg.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ @LIBS_XML@
+alnem_simulator_LDADD=   $(top_srcdir)/src/base/libgrassg.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ 
 alnem_sensor_LDADD=       $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@
 alnem_maestro_LDADD=      $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@
 
 bin_PROGRAMS=alnem_builder
-alnem_builder_LDADD=  @LIBS_SimGrid@ @LIBS_XML@
+alnem_builder_LDADD=  @LIBS_SimGrid@ 
 
 # cleanup temps
 CLEANFILES= _alnem_simulator.c _alnem_sensor.c _alnem_maestro.c 

diff --git a/examples/bandwidth/Makefile.am b/examples/bandwidth/Makefile.am
index 959b882..63705f1 100644 (file)
--- a/examples/bandwidth/Makefile.am
+++ b/examples/bandwidth/Makefile.am
@@ -8,7 +8,7 @@ bandwidth_maestro_SOURCES=      _bandwidth_maestro.c bandwidth.c
 bandwidth_sensor_SOURCES=      _bandwidth_sensor.c bandwidth.c
 
 
-bandwidth_simulator_LDADD=     $(top_srcdir)/src/base/libgrassg.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ @LIBS_XML@
+bandwidth_simulator_LDADD=     $(top_srcdir)/src/base/libgrassg.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ 
 bandwidth_maestro_LDADD=       $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a
 bandwidth_sensor_LDADD=        $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a
 

diff --git a/examples/ping/Makefile.am b/examples/ping/Makefile.am
index 190e3f1..cc51858 100644 (file)
--- a/examples/ping/Makefile.am
+++ b/examples/ping/Makefile.am
@@ -8,7 +8,7 @@ if HAVE_SG
  noinst_PROGRAMS=ping_simulator ping_client ping_server 
 
  ping_simulator_SOURCES=_ping_simulator.c ping.c
- ping_simulator_LDADD= $(top_srcdir)/src/base/libgrassg.a @LIBS_SimGrid@ @LIBS_XML@
+ ping_simulator_LDADD= $(top_srcdir)/src/base/libgrassg.a @LIBS_SimGrid@
 else
  noinst_PROGRAMS=ping_client ping_server
 endif

diff --git a/examples/saturate/Makefile.am b/examples/saturate/Makefile.am
index 50b24f1..e8dbc9a 100644 (file)
--- a/examples/saturate/Makefile.am
+++ b/examples/saturate/Makefile.am
@@ -7,7 +7,7 @@ saturate_simulator_SOURCES=       _saturate_simulator.c saturate.c
 saturate_sensor_SOURCES=          _saturate_sensor.c saturate.c
 saturate_maestro_SOURCES=         _saturate_maestro.c saturate.c
 
-saturate_simulator_LDADD=        $(top_srcdir)/src/base/libgrassg.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ @LIBS_XML@
+saturate_simulator_LDADD=        $(top_srcdir)/src/base/libgrassg.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@ 
 saturate_sensor_LDADD=            $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a
 saturate_maestro_LDADD=          $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a
 

diff --git a/src/amok/Makefile.am b/src/amok/Makefile.am
index 17b25ab..94a82d5 100644 (file)
--- a/src/amok/Makefile.am
+++ b/src/amok/Makefile.am
@@ -1,5 +1,5 @@
 DISTCLEANFILES=Makefile.in
-INCLUDES= -I$(top_srcdir)/src/include @CFLAGS_XML@ @CFLAGS_SimGrid@
+INCLUDES= -I$(top_srcdir)/src/include @CFLAGS_SimGrid@
 
 lib_LIBRARIES= libgrasmodules.a
 

diff --git a/src/gras/Makefile.am b/src/gras/Makefile.am
index 4ca6ecd..d2cf2f7 100644 (file)
--- a/src/gras/Makefile.am
+++ b/src/gras/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS=. Tests
 DISTCLEANFILES=Makefile.in
 INCLUDES= -I$(top_srcdir)/src/include \
-          @CFLAGS_XML@ @CFLAGS_SimGrid@
+          @CFLAGS_SimGrid@
 EXTRA_DIST= ./gras_private.h    \
        Core/dict_private.h \
        Transport/transport_interface.h \