From 2d71f65d9d83ec974281885f4e2bcd1abb01e05e Mon Sep 17 00:00:00 2001
From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 31 Jan 2005 21:57:09 +0000
Subject: [PATCH] moving include/surf to src/include/surf SURF is private. For
 developpers only.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@828 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 include/Makefile.am   |  9 ---------
 src/Makefile.am       | 10 +++++++++-
 testsuite/Makefile.am |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index 484daf3db6..449c553f37 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -11,12 +11,6 @@ nobase_include_HEADERS = \
 	xbt/config.h \
 	xbt/context.h \
 	\
-	surf/maxmin.h \
-	surf/trace_mgr.h \
-	surf/surf.h \
-	surf/surf_parse.h \
-	surf/surfxml.h \
-	\
 	msg/msg.h \
 	msg/datatypes.h \
 	\
@@ -28,6 +22,3 @@ nobase_include_HEADERS = \
 	\
 	amok/base.h \
 	amok/bandwidth.h
-
-surf/surfxml.h: ../src/surf/surfxml.dtd
-	cd surf; flexml -H -L ../../src/surf/surfxml.dtd
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d4652618b..06ca8aba44 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS= -g
 
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES= -I$(top_srcdir)/include 
+INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include 
 EXTRA_DIST= \
         \
 	portable.h \
@@ -35,6 +35,12 @@ EXTRA_DIST= \
 	surf/network_private.h \
 	surf/workstation_KCCFLN05_private.h \
 	\
+	include/maxmin.h \
+	include/trace_mgr.h \
+	include/surf.h \
+	include/surf_parse.h \
+	include/surfxml.h \
+	\
 	msg/private.h \
 	\
 	gras/Transport/transport_interface.h \
@@ -140,6 +146,8 @@ surf/surfxml.l: surf/surfxml.dtd
 	mv surfxml.l surfxml.l.bak ; \
 	sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.l.bak > surfxml.l
 
+include/surf/surfxml.h: src/surf/surfxml.dtd
+	cd include/surf; flexml -H -L ../../src/surf/surfxml.dtd
 
 libgras_la_SOURCES= $(COMMON_S) \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 56c6f9de78..8f2bed751b 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include 
 AM_CFLAGS=-g
 
 CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out
-- 
2.20.1