Let's find portable.h during VPATH builds

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

diff --git a/tools/gras/Makefile.am b/tools/gras/Makefile.am
index 3b22072..2f6e0fc 100644 (file)
--- a/tools/gras/Makefile.am
+++ b/tools/gras/Makefile.am
@@ -1,6 +1,6 @@
 AM_CFLAGS = -g
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include -I$(top_srcdir)/src
 
 bin_PROGRAMS = gras_stub_generator 
 # skel_rewriter

diff --git a/tools/gras/Makefile.in b/tools/gras/Makefile.in
index 26261d9..e19852b 100644 (file)
--- a/tools/gras/Makefile.in
+++ b/tools/gras/Makefile.in
@@ -121,6 +121,9 @@ FLEXML = @FLEXML@
 GRAMINE_MODE_FALSE = @GRAMINE_MODE_FALSE@
 GRAMINE_MODE_TRUE = @GRAMINE_MODE_TRUE@
 GRAS_DEP = @GRAS_DEP@
+GREP = @GREP@
+GTNETS_CFLAGS = @GTNETS_CFLAGS@
+GTNETS_LDFLAGS = @GTNETS_LDFLAGS@
 HAVE_FLEXML_FALSE = @HAVE_FLEXML_FALSE@
 HAVE_FLEXML_TRUE = @HAVE_FLEXML_TRUE@
 HAVE_SDP_FALSE = @HAVE_SDP_FALSE@
@@ -159,6 +162,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
 STRIP = @STRIP@
+USE_GTNETS_FALSE = @USE_GTNETS_FALSE@
+USE_GTNETS_TRUE = @USE_GTNETS_TRUE@
 USE_SIMIX_FALSE = @USE_SIMIX_FALSE@
 USE_SIMIX_TRUE = @USE_SIMIX_TRUE@
 VERSION = @VERSION@
@@ -168,15 +173,9 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -194,23 +193,30 @@ build_id = @build_id@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pth_skaddr_makecontext = @pth_skaddr_makecontext@
 pth_sksize_makecontext = @pth_sksize_makecontext@
 sbindir = @sbindir@
@@ -221,7 +227,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include -I$(top_srcdir)/src
 # skel_rewriter
 gras_stub_generator_SOURCES = stub_generator.c
 gras_stub_generator_LDADD = $(top_builddir)/src/libsimgrid.la 

diff --git a/tools/tesh/Makefile.am b/tools/tesh/Makefile.am
index 64523f3..dc7551a 100644 (file)
--- a/tools/tesh/Makefile.am
+++ b/tools/tesh/Makefile.am
@@ -1,6 +1,6 @@
 AM_CFLAGS = -g
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include -I$(top_srcdir)/src
 
 bin_PROGRAMS = tesh
 

diff --git a/tools/tesh/Makefile.in b/tools/tesh/Makefile.in
index 84c741b..89c8493 100644 (file)
--- a/tools/tesh/Makefile.in
+++ b/tools/tesh/Makefile.in
@@ -228,7 +228,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include -I$(top_srcdir)/src
 tesh_SOURCES = run_context.c run_context.h tesh.c tesh.h buff.h buff.c signal.c
 tesh_LDADD = $(top_builddir)/src/libgras.la 
 TESTS_ENVIRONMENT = ./tesh