aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiziano Müller <tiziano.mueller@stepping-stone.ch>2015-04-08 13:29:33 +0200
committerWayne Davison <wayned@samba.org>2015-04-26 16:50:16 -0700
commita2f733c664c977a79a91f4e63b5eacff642f4370 (patch)
tree7a56ae4b7b9e6da2df9d07a344512a8fd26e9313
parent3ea74eb3880b4fda95fced4f605bb96f19dd4b0f (diff)
downloadandroid_external_rsync-a2f733c664c977a79a91f4e63b5eacff642f4370.tar.gz
android_external_rsync-a2f733c664c977a79a91f4e63b5eacff642f4370.tar.bz2
android_external_rsync-a2f733c664c977a79a91f4e63b5eacff642f4370.zip
Rename aclocal.m4 to acinclude.m4 and add make target
It is common practice to split up m4 files for easier maintenance and generate the required aclocal.m4 using `aclocal` instead.
-rw-r--r--.gitignore1
-rw-r--r--Makefile.in3
-rw-r--r--acinclude.m4 (renamed from aclocal.m4)0
-rw-r--r--prepare-source.mak3
4 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 948d3f7f..23bd4d7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ config.h.in
config.h.in.old
config.log
config.status
+aclocal.m4
/proto.h
/proto.h-tstamp
/rsync.1
diff --git a/Makefile.in b/Makefile.in
index d0e0dded..a5ea668c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,6 +143,9 @@ gensend: gen
conf:
cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
+aclocal.m4: acinclude.m4
+ aclocal
+
configure.sh config.h.in: configure.ac aclocal.m4
@if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
@if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
diff --git a/aclocal.m4 b/acinclude.m4
index d489b203..d489b203 100644
--- a/aclocal.m4
+++ b/acinclude.m4
diff --git a/prepare-source.mak b/prepare-source.mak
index 054bab70..efb62283 100644
--- a/prepare-source.mak
+++ b/prepare-source.mak
@@ -1,5 +1,8 @@
conf: configure.sh config.h.in
+aclocal.m4:
+ aclocal
+
configure.sh: configure.ac aclocal.m4
autoconf -o configure.sh