remove gtk-doc-tools cruft

[simgrid.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aa76f36..f63ab4f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,19 @@
-SUBDIRS= src doc
+SUBDIRS= include src examples testsuite doc
 DISTCLEANFILES =  *~  
 
-ACLOCAL = aclocal -I acmacro -I /usr/share/aclocal/gnome2-macros
+ACLOCAL = aclocal -I acmacro
 AUTOMAKE_OPTIONS = gnu
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog\
+EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog ChangeLog.debian\
        acmacro/aci.m4 \
-       tools/gras-check-arch   tools/compile-remote-worker.in
+       tools/gras-check-arch   tools/compile-remote-worker.in \
+       tools/MSG_visualization tools/platform_generation \
+        tools/doxygen/index_create.pl
 
-TAGS: 
-       etags `find . -name "*.[ch]"`
+SOURCE_FILES = $(shell find . -name "*.[ch]")
+TAGS: $(SOURCE_FILES)
+       @etags $(SOURCE_FILES)
 
 tags: TAGS
 
@@ -26,11 +29,12 @@ release: distcheck remote debian publish
 
 debian: dist
        make -C ~/CVSIMPORT/pkg-grid/gras maintainerclean
-       cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras
+       cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/
+       cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/@PACKAGE@_@VERSION@.orig.tar.gz
        make -C ~/CVSIMPORT/pkg-grid/gras deb check
        dput local *.changes
 
-publish: dist
+publish-old: dist
         @echo "----[ Put the documentation on the local filesystem ]----"
         rm -rf ~/public_html/gras/doc
         mkdir ~/public_html/gras/doc
@@ -40,13 +44,24 @@ publish: dist
         @echo "----[ Sync remote host ]----"
         make -C public_html publish
 
+publish: dist
+        @echo "----[ Put the tarball @VERSION@ on gcl ]----"
+        scp @PACKAGE@-@VERSION@.tar.gz gcl.ucsd.edu:/home/www/simgrid/dl/
+        scp -r doc/html/* gcl.ucsd.edu:/home/www/simgrid/
+#       scp ChangeLog gcl.ucsd.edu:/home/www/simgrid/dl/ChangeLog
+        @echo "----[ Put the tarball @VERSION@ on the local filesystem ]----"
+        cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/simgrid2
+        cp -r doc/html ~/public_html/simgrid2/doc/
+#       cp ChangeLog ~/public_html/simgrid2/
+        make -C ~/public_html
+
 mail:
-        @ver=`dpkg-parsechangelog -lChangeLog| egrep '^Version: ' | sed 's/Version: //'`;\
+        @ver=`dpkg-parsechangelog -lChangeLog.debian| egrep '^Version: ' | sed 's/Version: //'`;\
          (echo "Hello," ; \
           echo; \
            echo "A new version of GRAS is available. Here is the changelog:";\
           echo;echo;\
-           dpkg-parsechangelog -lChangeLog ;\
+           dpkg-parsechangelog -lChangeLog.debian ;\
            echo;echo; \
           echo "It is available from the official website:";\
           echo "  http://grail.sdsc.edu/simgrid/";\
@@ -93,7 +108,7 @@ remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
           machine2=`echo $$site |sed 's/^\([^%]*\)%\(.*\)$$/\2/'`;\
           cmd="\"sh -c 'env REMOTE_PREFIX=$(REMOTE_PREFIX) $(REMOTE_PREFIX)/src/compile-remote-worker $(ACTION) 2>&1'\"";\
           if echo $$site | grep  '%' >/dev/null ; then \
-            echo "----[ Compile on $$machine2 (behide $$machine) ]----";\
+            echo "----[ Compile on $$machine2 (behind $$machine) ]----";\
           else \
             machine=$$site;\
             echo "----[ Compile on $$machine ]----";\
@@ -105,10 +120,10 @@ remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
           \
           echo "-- Compiling... (the output gets into buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; \
           if echo $$site | grep  '%' >/dev/null ; then \
-            if ssh -CA $$machine "env REMOTE_PREFIX=$(REMOTE_PREFIX) ssh -A $$machine2 $$cmd" 2>&1 > buildlogs/@PACKAGE@-@VERSION@/$$site.log;\
+            if ssh $$machine "env REMOTE_PREFIX=$(REMOTE_PREFIX) ssh -A $$machine2 $$cmd" 2>&1 > buildlogs/@PACKAGE@-@VERSION@/$$site.log;\
             then echo "Sucessful"; else failed=1;echo "Failed (check buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; fi;echo; \
           else \
-            if ssh -CA $$machine "eval $$cmd" 2>&1 > buildlogs/@PACKAGE@-@VERSION@/$$site.log ;\
+            if ssh $$machine "eval $$cmd" 2>&1 > buildlogs/@PACKAGE@-@VERSION@/$$site.log ;\
             then echo "Sucessful"; else failed=1;echo "Failed (check buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; fi;echo; \
           fi;\
        done;\