From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 29 Jan 2004 20:37:13 +0000 (+0000)
Subject: make dist now works
X-Git-Tag: v3.3~5321
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2de95fd8b3b3b3edb7e11074295f1b90d6427b36?ds=sidebyside

make dist now works


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

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000000..526ad1a336
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1 @@
+Makefile Makefile.in aclocal.m4 autom4te.cache config.status grenier libtool gras-0.0.040129.tar.gz
diff --git a/Makefile.am b/Makefile.am
index a83495f9de..ca6d9e9d69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
 SUBDIRS= doc src 
 DISTCLEANFILES =  *~  
 
-ACLOCAL = aclocal -I tools/acmacro -I /usr/share/aclocal/gnome2-macros
+ACLOCAL = aclocal -I acmacro -I /usr/share/aclocal/gnome2-macros
 AUTOMAKE_OPTIONS = gnu
 
-EXTRA_DIST = bootstrap COPYING INSTALL NEWS README TODO AUTHORS                        
+EXTRA_DIST = bootstrap COPYING INSTALL NEWS README TODO AUTHORS \
+	acmacro/aci.m4
 #	Cflags.Makefile.am                      \
 #	doc/FAQ.txt                             \
 #	doc/footer.html                         \
diff --git a/configure b/configure
index 14201cde23..7121fe395f 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 1.1.1.1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GRAS 0.1.
+# Generated by GNU Autoconf 2.59 for GRAS 0.0.040129.
 #
 # Report bugs to <martin.quinson@ens-lyon.fr>.
 #
@@ -424,8 +424,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GRAS'
 PACKAGE_TARNAME='gras'
-PACKAGE_VERSION='0.1'
-PACKAGE_STRING='GRAS 0.1'
+PACKAGE_VERSION='0.0.040129'
+PACKAGE_STRING='GRAS 0.0.040129'
 PACKAGE_BUGREPORT='martin.quinson@ens-lyon.fr'
 
 ac_unique_file="src/include/gras.h"
@@ -956,7 +956,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GRAS 0.1 to adapt to many kinds of systems.
+\`configure' configures GRAS 0.0.040129 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1023,7 +1023,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GRAS 0.1:";;
+     short | recursive ) echo "Configuration of GRAS 0.0.040129:";;
    esac
   cat <<\_ACEOF
 
@@ -1177,7 +1177,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GRAS configure 0.1
+GRAS configure 0.0.040129
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1191,7 +1191,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GRAS $as_me 0.1, which was
+It was created by GRAS $as_me 0.0.040129, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1900,7 +1900,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gras'
- VERSION='0.1'
+ VERSION='0.0.040129'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22179,7 +22179,7 @@ fi
 WARNING="This file is generated, do not edit"
 
 
-                                                                                                                        ac_config_files="$ac_config_files Makefile src/Makefile src/base/Makefile src/base/Tests/Makefile src/base/Tests/gs_example src/modules/Makefile src/examples/Makefile src/examples/ping/Makefile src/examples/bandwidth/Makefile src/examples/saturate/Makefile src/examples/alnem/Makefile doc/Makefile"
+                                                                                                                                                      ac_config_files="$ac_config_files Makefile src/Makefile src/include/Makefile src/include/modules/Makefile src/base/Makefile src/base/Tests/Makefile src/base/Tests/gs_example src/base/Tests/run_tests src/modules/Makefile src/examples/Makefile src/examples/ping/Makefile src/examples/bandwidth/Makefile src/examples/saturate/Makefile src/examples/alnem/Makefile doc/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -22593,7 +22593,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GRAS $as_me 0.1, which was
+This file was extended by GRAS $as_me 0.0.040129, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22656,7 +22656,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GRAS config.status 0.1
+GRAS config.status 0.0.040129
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -22768,9 +22768,12 @@ do
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+  "src/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
+  "src/include/modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/include/modules/Makefile" ;;
   "src/base/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/base/Makefile" ;;
   "src/base/Tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/base/Tests/Makefile" ;;
   "src/base/Tests/gs_example" ) CONFIG_FILES="$CONFIG_FILES src/base/Tests/gs_example" ;;
+  "src/base/Tests/run_tests" ) CONFIG_FILES="$CONFIG_FILES src/base/Tests/run_tests" ;;
   "src/modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;;
   "src/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
   "src/examples/ping/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/examples/ping/Makefile" ;;
@@ -23201,29 +23204,50 @@ s,@INSTALL@,$ac_INSTALL,;t t
   # Run the commands associated with the file.
   case $ac_file in
     Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
+    src/include/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
+    src/include/modules/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/base/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/base/Tests/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/base/Tests/gs_example ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
+    src/base/Tests/run_tests ) ( cd src/include ; test -e gras || ln -s . gras )
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/modules/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/examples/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/examples/ping/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/examples/bandwidth/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/examples/saturate/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     src/examples/alnem/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
     doc/Makefile ) ( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example ;;
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests ;;
   esac
 done
 _ACEOF
diff --git a/configure.ac b/configure.ac
index ccb572b6c7..44e3b682fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.57)
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.1],[martin.quinson@ens-lyon.fr])
+AC_INIT([GRAS],[0.0.040129],[martin.quinson@ens-lyon.fr])
 AC_CONFIG_SRCDIR([src/include/gras.h])
 AC_REVISION($Revision$)
 AC_CONFIG_SUBDIRS(src/nws_portability)
@@ -72,9 +72,12 @@ dnl ####[ Makes the output ]###################################################
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
+    src/include/Makefile
+      src/include/modules/Makefile
     src/base/Makefile
       src/base/Tests/Makefile
       src/base/Tests/gs_example
+      src/base/Tests/run_tests
     src/modules/Makefile
     src/examples/Makefile 
       src/examples/ping/Makefile 
@@ -82,7 +85,8 @@ AC_CONFIG_FILES([
       src/examples/alnem/Makefile 
   doc/Makefile
 ],[( cd src/include ; test -e gras || ln -s . gras )
-     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example])
+     test -e src/base/Tests/gs_example && chmod +x src/base/Tests/gs_example;
+     test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests])
 
 AC_OUTPUT
 
diff --git a/cruft/doc/Makefile.am b/cruft/doc/Makefile.am
index bf8f5576d7..be1dd8b156 100644
--- a/cruft/doc/Makefile.am
+++ b/cruft/doc/Makefile.am
@@ -41,7 +41,7 @@ IGNORE_HFILES=
 HTML_IMAGES =
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-content_files =
+content_files = overview.sgml
 
 # Other files to distribute.
 extra_files =
@@ -72,7 +72,6 @@ EXTRA_DIST = 				\
 	$(extra_files)			\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE).types		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_OVERRIDES)
 
@@ -93,14 +92,6 @@ all-local: html-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB)
 	@echo '*** Scanning header files ***'
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scanobj $(SCANOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
 	cd $(srcdir) && \
 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	touch scan-build.stamp
diff --git a/doc/.cvsignore b/doc/.cvsignore
index ad884ec30e..0c2125a913 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -2,3 +2,5 @@ Makefile *.stamp html *.new gras-unused.txt gras.args gras.hierarchy gras.interf
 gras-decl-list.txt
 gras-decl.txt
 sgml
+Makefile.in
+gras-undocumented.txt
diff --git a/include/.cvsignore b/include/.cvsignore
new file mode 100644
index 0000000000..aa61a42e25
--- /dev/null
+++ b/include/.cvsignore
@@ -0,0 +1 @@
+Makefile.in Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000000..84ea0dbcd2
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,16 @@
+SUBDIRS=modules
+EXTRA_DIST=    \
+	gras.h \
+	log.h  \
+	error.h \
+	module.h \
+	dynar.h \
+	dict.h \
+	config.h \
+	\
+	datadesc.h \
+	data_description.h dd_type_bag.h \
+	\
+	socket.h messages.h \
+	\
+	core.h
diff --git a/include/modules/.cvsignore b/include/modules/.cvsignore
new file mode 100644
index 0000000000..aa61a42e25
--- /dev/null
+++ b/include/modules/.cvsignore
@@ -0,0 +1 @@
+Makefile.in Makefile
diff --git a/include/modules/Makefile.am b/include/modules/Makefile.am
new file mode 100644
index 0000000000..d6e4564e53
--- /dev/null
+++ b/include/modules/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST=    \
+	bandwidth.h  base.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a6d43913fa..03c2356ec7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS=nws_portability base modules examples
+SUBDIRS=nws_portability base modules examples include
 #SUBDIRS=core modules examples
diff --git a/src/gras/Makefile.am b/src/gras/Makefile.am
index d9fa036cf2..37b8c2ef98 100644
--- a/src/gras/Makefile.am
+++ b/src/gras/Makefile.am
@@ -2,24 +2,28 @@ SUBDIRS=. Tests
 DISTCLEANFILES=Makefile.in
 INCLUDES= -I$(top_srcdir)/src/include -I../nws_portability/Include  \
           @CFLAGS_XML@ @CFLAGS_SimGrid@
-EXTRA_DIST=gs/parse.yy.l
+EXTRA_DIST=                 \
+	gras_private.h      \
+	Core/dict_private.h \
+	gs/gs_private.h     \
+	gs/parse.yy.l      
 
 
 lib_LIBRARIES= libgrasrl.a libgrassg.a
 
 noinst_LIBRARIES=libgrasutils.a
 
-#                     core/dict_multi.c
+#                     Core/dict_multi.c
 #  Common/gras.c      Common/gras_datadesc.c        Common/gras_msg.c            
 
 COMMON_S=\
   \
-  core/module.c                                                                 \
-  core/log.c         core/log_default_appender.c   core/error.c                 \
-  core/dynar.c                                                                  \
-  core/dict.c        core/dict_elm.c               core/dict_cursor.c           \
+  Core/module.c                                                                 \
+  Core/log.c         Core/log_default_appender.c   Core/error.c                 \
+  Core/dynar.c                                                                  \
+  Core/dict.c        Core/dict_elm.c               Core/dict_cursor.c           \
   \
-  core/config.c                               \
+  Core/config.c                               \
   \
   gs/datadesc.c                               \
   gs/tools.c                                  \
@@ -32,7 +36,7 @@ COMMON_S=\
   gs/type_driver.c     gs/type_driver.h       \
   gs/message.c         gs/message.h           \
   gs/type.c            gs/type.h              \
-  gs/parse.c           gs/parse.h             gs/parse.yy.c \
+  gs/parse.c           gs/parse.yy.h             gs/parse.yy.c \
   gs/vars.c
 
 gs/parse.yy.c: gs/parse.yy.l
diff --git a/src/nws_portability/Makedefs.in b/src/nws_portability/Makedefs.in
index ff14ad2b34..8443609ce4 100644
--- a/src/nws_portability/Makedefs.in
+++ b/src/nws_portability/Makedefs.in
@@ -7,9 +7,9 @@
 configured	= @host@
 
 # Distribution variables
-TOP		= @TOP@
+TOP		= @TOP@/../../
 DIST_NAME	= portability.tar
-DIST_ROOT	= $(TOP)/Portability
+DIST_ROOT	= $(TOP)/gras-0.0.040129/src/nws_portability
 
 # System-dependent values determined by the configuration script.
 AR		= @AR@
diff --git a/src/nws_portability/Makefile b/src/nws_portability/Makefile
index 7794cc3638..8153d8593e 100755
--- a/src/nws_portability/Makefile
+++ b/src/nws_portability/Makefile
@@ -50,15 +50,12 @@ distclean: confclean
 	@echo "Removing build directories ..."
 	@$(RM) -rf $(builddir) $(DIST_NAME)
 
-dist: 
-	@$(RM) -rf $(DIST_ROOT) $(DIST_NAME)
-	@$(INSTALL) -d $(DIST_ROOT)
-	@for subdir in $(SUBDIRS); do \
+distdir:
+	$(INSTALL) -d $(DIST_ROOT)
+	for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) dist) || exit $$? ; done
-	@$(CP)  $(DIST_FILES) $(DIST_ROOT)
-	@$(CP) *.c $(DIST_ROOT)
-	@$(TAR) cf $(TOP)/$(DIST_NAME) Portability
-	@$(RM) -rf $(DIST_ROOT)
+	$(CP)  $(DIST_FILES) $(DIST_ROOT)
+	$(CP) *.c $(DIST_ROOT)
 
 .PHONY: install
 install: all 
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 39ce97acdf..7e3935a829 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -4,6 +4,7 @@ AM_LDFLAGS=-g
 
 CLEANFILES = *~ test a.out *.o
 DISTCLEANFILES=Makefile.in *~
+EXTRA_DIST=test_utils.c run_tests.in
 
 # Test stuff
 
diff --git a/testsuite/gras/run_tests b/testsuite/run_tests.in
similarity index 98%
rename from testsuite/gras/run_tests
rename to testsuite/run_tests.in
index 89c549eb6c..2e766594f3 100755
--- a/testsuite/gras/run_tests
+++ b/testsuite/run_tests.in
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! @BASH@
 failed_nb=0
 success_nb=0
 tests_nb=0