From 320c1fe541f529573238ebba0bee1ec0293f1af4 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 7 Sep 2004 13:39:33 +0000 Subject: [PATCH] fix paths so that make distcheck works again git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@401 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- ChangeLog | 5 ++++ Makefile.am | 2 +- configure.ac | 42 ++++++++++++++++++------------- cruft/doc/Makefile.am | 3 ++- cruft/doc/tmpl/comm_messages.sgml | 6 +++-- examples/ping/Makefile.am | 12 ++++----- src/Makefile.am | 7 +++--- src/gras_private.h | 14 +++++------ testsuite/Makefile.am | 5 ++-- testsuite/gras/datadesc_usage.c | 2 +- testsuite/gras/trp_file_client.c | 2 +- testsuite/gras/trp_file_server.c | 2 +- testsuite/gras/trp_tcp_client.c | 2 +- testsuite/gras/trp_tcp_server.c | 2 +- testsuite/run_tests.in | 16 ++++++------ 15 files changed, 70 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 836f1f814f..fcecf53eab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-07 Martin Quinson + Version 0.6.3 (protocol not changed; API changed) + - Source code reorganization to allow Arnaud to put the surf in the same + tree. + 2004-08-18 Martin Quinson Version 0.6.2 (protocol not changed; API changed) - Interface cleanup: gras_msgtype_by_name returns the type (instead of a diff --git a/Makefile.am b/Makefile.am index 414b624e88..37df7632d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS= src doc +SUBDIRS= include src examples doc testsuite DISTCLEANFILES = *~ ACLOCAL = aclocal -I acmacro -I /usr/share/aclocal/gnome2-macros diff --git a/configure.ac b/configure.ac index 4b514dcb5a..9268314a27 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ AC_PREREQ(2.59) #We need a recent ACI ACI_PREREQ(2003.01.16) -AC_INIT([GRAS],[0.6.2],[martin.quinson@ens-lyon.fr]) -AC_CONFIG_SRCDIR([src/include/gras.h]) +AC_INIT([GRAS],[0.6.3],[martin.quinson@ens-lyon.fr]) +AC_CONFIG_SRCDIR([include/gras.h]) AC_CONFIG_HEADERS([src/gras_config.h]) AC_REVISION($Revision$) @@ -95,29 +95,37 @@ AC_SUBST(WARNING) dnl ####[ Makes the output ]################################################### AC_CONFIG_FILES([ Makefile + include/Makefile src/Makefile - src/include/Makefile - src/base/Makefile - src/base/Tests/Makefile - src/base/Tests/run_tests - src/base/Tests/trp_tcp_usage - src/base/Tests/trp_file_usage - src/examples/Makefile - src/examples/ping/Makefile - src/examples/ping/test_sg + examples/Makefile + examples/ping/Makefile + examples/ping/test_sg doc/Makefile tools/compile-remote-worker + testsuite/Makefile + testsuite/run_tests + testsuite/gras/trp_tcp_usage ],[ - test -e src/base/Tests/trp_tcp_usage && chmod +x src/base/Tests/trp_tcp_usage; - test -e src/base/Tests/trp_file_usage&& chmod +x src/base/Tests/trp_file_usage; - test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests; + test -e testsuite/run_tests && chmod +x testsuite/run_tests; + test -e testsuite/gras/trp_tcp_usage && chmod +x testsuite/gras/trp_tcp_usage; + test -e testsuite/gras/trp_file_usage&& chmod +x testsuite/gras/trp_file_usage; test -e tools/compile-remote-worker && chmod +x tools/compile-remote-worker; - test -e src/examples/ping/test_sg && chmod +x src/examples/ping/test_sg; + test -e examples/ping/test_sg && chmod +x examples/ping/test_sg; chmod +x $srcdir/tools/gras-check-arch; - chmod +x $srcdir/src/examples/ping/test_rl]) + chmod +x $srcdir/examples/ping/test_rl +]) + +# src/gros/Makefile +# src/gras/Makefile + +# testsuite/gras/Makefile +# +# testsuite/gras/trp_tcp_usage +# testsuite/gras/trp_file_usage + # src/examples/pastry/Makefile -# src/modules/Makefile +# src/amok/Makefile # src/examples/bandwidth/Makefile src/examples/saturate/Makefile # src/examples/alnem/Makefile diff --git a/cruft/doc/Makefile.am b/cruft/doc/Makefile.am index 99e0446836..b139030bb9 100644 --- a/cruft/doc/Makefile.am +++ b/cruft/doc/Makefile.am @@ -30,7 +30,8 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml --ignore-files="ddt_parse.yy.c" FIXXREF_OPTIONS= # Used for dependencies. -HFILE_GLOB=$(shell find $(top_srcdir)/src -name "*.h") +HFILE_GLOB=$(shell find $(top_srcdir)/src -name "*.h") \ + $(shell find $(top_srcdir)/include -name "*.h") CFILE_GLOB=$(shell find $(top_srcdir)/src -name "*.c"|grep -v ddt_parse.yy.c) #CFILE_GLOB=$(top_srcdir)/src/core/*.c diff --git a/cruft/doc/tmpl/comm_messages.sgml b/cruft/doc/tmpl/comm_messages.sgml index 4b208e377f..a11ecdc53d 100644 --- a/cruft/doc/tmpl/comm_messages.sgml +++ b/cruft/doc/tmpl/comm_messages.sgml @@ -45,8 +45,9 @@ Defining messages and callbacks, and sending/receiving messages. @name: -@dst: @Returns: + +@dst: @@ -56,8 +57,9 @@ Defining messages and callbacks, and sending/receiving messages. @name: @version: -@dst: @Returns: + +@dst: diff --git a/examples/ping/Makefile.am b/examples/ping/Makefile.am index 8b3f529fe9..4e9edc5430 100644 --- a/examples/ping/Makefile.am +++ b/examples/ping/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= -I$(top_srcdir)/src/include +INCLUDES= -I$(top_srcdir)/include AM_CFLAGS=-g TESTS=test_rl test_sg EXTRA_DIST=ping_deployment.txt $(TESTS) @@ -10,7 +10,7 @@ if HAVE_SG check_PROGRAMS=ping_simulator ping_client ping_server ping_simulator_SOURCES=_ping_simulator.c ping.c - ping_simulator_LDADD= $(top_builddir)/src/base/libgrassg.la @LIBS_SimGrid@ + ping_simulator_LDADD= $(top_builddir)/libgrassg.la @LIBS_SimGrid@ else check_PROGRAMS=ping_client ping_server endif @@ -18,15 +18,15 @@ endif ping_client_SOURCES= _ping_client.c ping.c ping_server_SOURCES= _ping_server.c ping.c -ping_client_LDADD= $(top_builddir)/src/base/libgrasrl.la -ping_server_LDADD= $(top_builddir)/src/base/libgrasrl.la +ping_client_LDADD= $(top_builddir)/src/libgrasrl.la +ping_server_LDADD= $(top_builddir)/src/libgrasrl.la # cleanup temps MAINTAINERCLEANFILES = _ping_simulator.c _ping_client.c _ping_server.c # generate temps -_ping_client.c _ping_server.c _ping_simulator.c: ping_deployment.txt $(top_srcdir)/src/examples/gras_stub_generator - $(top_srcdir)/src/examples/gras_stub_generator ping ping_deployment.txt >/dev/null +_ping_client.c _ping_server.c _ping_simulator.c: ping_deployment.txt $(top_srcdir)/examples/gras_stub_generator + $(top_srcdir)/examples/gras_stub_generator ping ping_deployment.txt >/dev/null # support vpath build diff --git a/src/Makefile.am b/src/Makefile.am index ebcec5575f..86b82ddad7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,12 +12,13 @@ AM_CFLAGS= -DNDEBUG MAINTAINERCLEANFILES=Makefile.in -INCLUDES= -I$(top_srcdir)/src/include \ +INCLUDES= -I$(top_srcdir)/include \ @CFLAGS_SimGrid@ EXTRA_DIST= \ + gras_private.h\ + \ gros/dict_private.h \ \ - gras/gras_private.h \ gras/Transport/transport_interface.h \ gras/Virtu/virtu_interface.h \ gras/Virtu/virtu_rl.h \ @@ -72,7 +73,7 @@ endif COMMON_S=\ \ - gros/module.c gros/core_interface.h \ + gros/module.c gros/gros_interface.h \ gros/log.c gros/log_default_appender.c gros/error.c \ gros/dynar.c \ gros/dict.c gros/dict_elm.c gros/dict_cursor.c \ diff --git a/src/gras_private.h b/src/gras_private.h index 88b155fb6a..3a3e4f2469 100644 --- a/src/gras_private.h +++ b/src/gras_private.h @@ -26,13 +26,13 @@ #include "gras_config.h" -#include "gras/error.h" -#include "gras/log.h" -#include "gras/module.h" -#include "gras/dynar.h" -#include "gras/dict.h" -#include "gras/set.h" -#include "gras/config.h" +#include "gros/error.h" +#include "gros/log.h" +#include "gros/module.h" +#include "gros/dynar.h" +#include "gros/dict.h" +#include "gros/set.h" +#include "gros/config.h" #include "gras/core.h" #include "gras/process.h" diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 045ce708a2..329970b7d7 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -1,7 +1,8 @@ -INCLUDES = -I$(top_srcdir)/src/include +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src AM_CFLAGS=-g -CLEANFILES = *~ test a.out *.o datadesc_usage.out +CLEANFILES = *~ test a.out *.o datadesc_usage.out +DISTCLEANFILES = gras/.libs/* gros/.libs/* MAINTAINERCLEANFILES=Makefile.in EXTRA_DIST=run_tests.in \ gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \ diff --git a/testsuite/gras/datadesc_usage.c b/testsuite/gras/datadesc_usage.c index 902f6b5806..50dcf4084d 100644 --- a/testsuite/gras/datadesc_usage.c +++ b/testsuite/gras/datadesc_usage.c @@ -11,7 +11,7 @@ #include #include -#include "../src/gras/DataDesc/datadesc_interface.h" +#include "gras/DataDesc/datadesc_interface.h" GRAS_LOG_NEW_DEFAULT_CATEGORY(test); #define READ 0 diff --git a/testsuite/gras/trp_file_client.c b/testsuite/gras/trp_file_client.c index 3488145a6f..d27323d617 100644 --- a/testsuite/gras/trp_file_client.c +++ b/testsuite/gras/trp_file_client.c @@ -10,7 +10,7 @@ #include #include -#include "../gras/Transport/transport_interface.h" +#include "gras/Transport/transport_interface.h" //GRAS_LOG_NEW_DEFAULT_CATEGORY(test); diff --git a/testsuite/gras/trp_file_server.c b/testsuite/gras/trp_file_server.c index 75386420d4..b3b23b810a 100644 --- a/testsuite/gras/trp_file_server.c +++ b/testsuite/gras/trp_file_server.c @@ -10,7 +10,7 @@ #include #include -#include "../gras/Transport/transport_interface.h" +#include "gras/Transport/transport_interface.h" //GRAS_LOG_NEW_DEFAULT_CATEGORY(test); diff --git a/testsuite/gras/trp_tcp_client.c b/testsuite/gras/trp_tcp_client.c index 6012a1c4b4..1e3a9e1d4a 100644 --- a/testsuite/gras/trp_tcp_client.c +++ b/testsuite/gras/trp_tcp_client.c @@ -10,7 +10,7 @@ #include #include -#include "../src/gras/Transport/transport_interface.h" +#include "gras/Transport/transport_interface.h" //GRAS_LOG_NEW_DEFAULT_CATEGORY(test); diff --git a/testsuite/gras/trp_tcp_server.c b/testsuite/gras/trp_tcp_server.c index 4e0e1fcc66..216f35add2 100644 --- a/testsuite/gras/trp_tcp_server.c +++ b/testsuite/gras/trp_tcp_server.c @@ -10,7 +10,7 @@ #include #include -#include "../src/gras/Transport/transport_interface.h" +#include "gras/Transport/transport_interface.h" //GRAS_LOG_NEW_DEFAULT_CATEGORY(test); diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in index 6859868d4f..c7cc98c80a 100755 --- a/testsuite/run_tests.in +++ b/testsuite/run_tests.in @@ -12,16 +12,16 @@ else valgrind= fi # config_usage \ -for test in log_usage \ - dynar_int dynar_double dynar_string \ - dict_usage dict_crash \ +for test in gros/log_usage \ + gros/dynar_int gros/dynar_double gros/dynar_string \ + gros/dict_usage gros/dict_crash \ \ - datadesc_usage -# "datadesc_usage --read @srcdir@/datadesc.little32" \ -# "datadesc_usage --read @srcdir@/datadesc.big32" \ -# "datadesc_usage --read @srcdir@/datadesc.big64" + gras/datadesc_usage +# "gras/datadesc_usage --read @srcdir@/datadesc.little32" \ +# "gras/datadesc_usage --read @srcdir@/datadesc.big32" \ +# "gras/datadesc_usage --read @srcdir@/datadesc.big64" -# "datadesc_usage --read @srcdir@/datadesc.little64" \ +# "gras/datadesc_usage --read @srcdir@/datadesc.little64" \ do tests_nb=`expr $tests_nb + 1` echo "#### Test $test" -- 2.20.1