Add a dist-files target to all makefiles. It outputs all files which must be placed...

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

diff --git a/acmacro/dist-files.mk b/acmacro/dist-files.mk
new file mode 100644 (file)
index 0000000..419574b
--- /dev/null
+++ b/acmacro/dist-files.mk
@@ -0,0 +1,9 @@
+# Makefile chunk which allows to display the files which should be included
+# into the distribution.
+
+# It is intended to be included in all Makefile.am 
+
+dist-files:
+       @for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
+       @echo
+       @for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ea6e555..5fd9ece 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -57,3 +57,5 @@ uninstall-local:
        done
 
 .PHONY: html
        done
 
 .PHONY: html

+
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/Makefile.am b/examples/Makefile.am
index c20f8da..94ae975 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS=msg gras # ping bandwidth alnem saturate
 EXTRA_DIST= modules.doc 
 SUBDIRS=msg gras # ping bandwidth alnem saturate
 EXTRA_DIST= modules.doc 

+
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/Makefile.am b/examples/gras/Makefile.am
index 1d5ab97..6e912ff 100644 (file)
--- a/examples/gras/Makefile.am
+++ b/examples/gras/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS= ping timer chrono # bandwidth alnem saturate
 SUBDIRS= ping timer chrono # bandwidth alnem saturate

+
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/chrono/Makefile.am b/examples/gras/chrono/Makefile.am
index 0cf0a9c..a9233c1 100644 (file)
--- a/examples/gras/chrono/Makefile.am
+++ b/examples/gras/chrono/Makefile.am
@@ -22,3 +22,4 @@ CLEANFILES= _chrono_simulator.c _chrono_multiplier.c
 _chrono_multiplier.c _chrono_simulator.c: chrono_deployment.xml $(top_srcdir)/tools/gras/gras_stub_generator
        $(top_srcdir)/tools/gras/gras_stub_generator chrono chrono_deployment.xml >/dev/null
 
 _chrono_multiplier.c _chrono_simulator.c: chrono_deployment.xml $(top_srcdir)/tools/gras/gras_stub_generator
        $(top_srcdir)/tools/gras/gras_stub_generator chrono chrono_deployment.xml >/dev/null
 

+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/ping/Makefile.am b/examples/gras/ping/Makefile.am
index 7253f52..8cecdd2 100644 (file)
--- a/examples/gras/ping/Makefile.am
+++ b/examples/gras/ping/Makefile.am
@@ -25,3 +25,4 @@ PROCESSES= client server
 $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _ping_simulator.c: $(srcdir)/ping_deployment.xml $(top_srcdir)/tools/gras/gras_stub_generator
        $(top_srcdir)/tools/gras/gras_stub_generator ping ping_deployment.xml >/dev/null
 
 $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _ping_simulator.c: $(srcdir)/ping_deployment.xml $(top_srcdir)/tools/gras/gras_stub_generator
        $(top_srcdir)/tools/gras/gras_stub_generator ping ping_deployment.xml >/dev/null
 

+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/timer/Makefile.am b/examples/gras/timer/Makefile.am
index d909385..3b90502 100644 (file)
--- a/examples/gras/timer/Makefile.am
+++ b/examples/gras/timer/Makefile.am
@@ -23,3 +23,4 @@ MAINTAINERCLEANFILES = _$(NAME)_simulator.c _$(NAME)_client.c _$(NAME)_server.c
 $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME)_deployment.xml $(top_srcdir)/tools/gras/gras_stub_generator
        $(top_srcdir)/tools/gras/gras_stub_generator $(NAME) $(NAME)_deployment.xml >/dev/null
 
 $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME)_deployment.xml $(top_srcdir)/tools/gras/gras_stub_generator
        $(top_srcdir)/tools/gras/gras_stub_generator $(NAME) $(NAME)_deployment.xml >/dev/null
 

+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index 93c96af..bac31a6 100644 (file)
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -8,3 +8,4 @@ check_PROGRAMS=msg_test
 msg_test_SOURCES= messages.h msg_test.c
 msg_test_LDADD=        $(top_builddir)/src/libsimgrid.la
 
 msg_test_SOURCES= messages.h msg_test.c
 msg_test_LDADD=        $(top_builddir)/src/libsimgrid.la
 

+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/include/Makefile.am b/include/Makefile.am
index ae6403b..15c8635 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,3 +21,5 @@ nobase_include_HEADERS = \
        \
        amok/base.h \
        amok/bandwidth.h
        \
        amok/base.h \
        amok/bandwidth.h

+
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/src/Makefile.am b/src/Makefile.am
index a088abf..6662a0f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -172,3 +172,6 @@ libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm
 
 libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm
 
 libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm

+
+
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/src/amok/Makefile.am b/src/amok/Makefile.am
index 87a9fd4..7776abb 100644 (file)
--- a/src/amok/Makefile.am
+++ b/src/amok/Makefile.am
@@ -12,4 +12,5 @@ libamok_la_SOURCES= \
 
 VERSION_INFO= -release 20040722 -version-info 0:0:0
 
 
 VERSION_INFO= -release 20040722 -version-info 0:0:0
 

+include $(top_srcdir)/acmacro/dist-files.mk

 
 

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 3edc2e3..93da8f0 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -90,3 +90,5 @@ gras_datadesc_usage_LDADD=     $(LDADD_RL)
 
 gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
        cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c
 
 gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
        cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c

+
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 87fe9b3..cd23468 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS=gras
 SUBDIRS=gras

+include $(top_srcdir)/acmacro/dist-files.mk

 
 

diff --git a/tools/gras/Makefile.am b/tools/gras/Makefile.am
index 78aa2eb..be33e5f 100644 (file)
--- a/tools/gras/Makefile.am
+++ b/tools/gras/Makefile.am
@@ -9,3 +9,5 @@ LDADD_RL=   $(top_builddir)/src/libsimgrid.la
 
 gras_stub_generator_SOURCES = stub_generator.c
 gras_stub_generator_LDADD = $(LDADD_UTILS)
 
 gras_stub_generator_SOURCES = stub_generator.c
 gras_stub_generator_LDADD = $(LDADD_UTILS)

+
+include $(top_srcdir)/acmacro/dist-files.mk