From 754517751ffe1ca4227b69b8e10ac4bc0e10461e Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 7 Jul 2004 02:30:46 +0000 Subject: [PATCH] Let make dist work even when SG is not there git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@199 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/Makefile.am | 3 ++- examples/ping/Makefile.am | 14 +++++++++----- src/Makefile.am | 5 ++--- src/gras/Makefile.am | 9 ++++++--- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 4ca3f8a317..eb677f7176 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,2 +1,3 @@ -SUBDIRS=ping +SUBDIRS=ping +EXTRA_DIST=gras_stub_generator #bandwidth saturate alnem diff --git a/examples/ping/Makefile.am b/examples/ping/Makefile.am index b7b43b87b4..190e3f1bbf 100644 --- a/examples/ping/Makefile.am +++ b/examples/ping/Makefile.am @@ -1,17 +1,21 @@ DISTCLEANFILES=Makefile.in INCLUDES= -I$(top_srcdir)/src/include -g -EXTRA_DIST=test_rl test_sg +EXTRA_DIST=test_rl test_sg ping_deployment.txt TESTS=test_rl test_sg # AUTOMAKE variable definition -noinst_PROGRAMS=ping_simulator ping_client ping_server +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@ +else + noinst_PROGRAMS=ping_client ping_server +endif -ping_simulator_SOURCES= _ping_simulator.c ping.c ping_client_SOURCES= _ping_client.c ping.c ping_server_SOURCES= _ping_server.c ping.c - -ping_simulator_LDADD= $(top_srcdir)/src/base/libgrassg.a @LIBS_SimGrid@ @LIBS_XML@ ping_client_LDADD= $(top_srcdir)/src/base/libgrasrl.a ping_server_LDADD= $(top_srcdir)/src/base/libgrasrl.a diff --git a/src/Makefile.am b/src/Makefile.am index c6c5ff351d..cf00e4689a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,2 @@ -#SUBDIRS=nws_portability base modules examples include -SUBDIRS=include base modules examples -#SUBDIRS=core modules examples +SUBDIRS=include base examples +# modules (before examples) diff --git a/src/gras/Makefile.am b/src/gras/Makefile.am index 38e230f529..4ca6ecdcde 100644 --- a/src/gras/Makefile.am +++ b/src/gras/Makefile.am @@ -2,9 +2,12 @@ SUBDIRS=. Tests DISTCLEANFILES=Makefile.in INCLUDES= -I$(top_srcdir)/src/include \ @CFLAGS_XML@ @CFLAGS_SimGrid@ -EXTRA_DIST= \ - gras_private.h \ - Core/dict_private.h +EXTRA_DIST= ./gras_private.h \ + Core/dict_private.h \ + Transport/transport_interface.h \ + Virtu/virtu_interface.h \ + Virtu/virtu_rl.h \ + Virtu/virtu_sg.h # DataDesc/parse.yy.l -- 2.20.1