Let make remote work with VPATH

[simgrid.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3689553..60db739 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS= include src examples testsuite doc
 DISTCLEANFILES =  *~  
 
-ACLOCAL = aclocal -I acmacro -I /usr/share/aclocal/gnome2-macros
+ACLOCAL = aclocal-1.9 -I acmacro
 AUTOMAKE_OPTIONS = gnu
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
@@ -11,8 +11,9 @@ EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS Chan
        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
 
@@ -114,7 +115,7 @@ remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
           fi;\
           \
           echo "-- Copy the data over"; \
-          scp @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker \
+          scp @srcdir@/@PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker \
               $$machine:$(REMOTE_PREFIX)/src;\
           \
           echo "-- Compiling... (the output gets into buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; \