git.samba.org / rsync.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3ea74eb)
Rename aclocal.m4 to acinclude.m4 and add make target
authorTiziano Müller <tiziano.mueller@stepping-stone.ch>
Wed, 8 Apr 2015 11:29:33 +0000 (13:29 +0200)
committerWayne Davison <wayned@samba.org>
Sun, 26 Apr 2015 23:50:16 +0000 (16:50 -0700)
It is common practice to split up m4 files for easier maintenance and
generate the required aclocal.m4 using `aclocal` instead.

.gitignore patch | blob | history
Makefile.in patch | blob | history
acinclude.m4 [moved from aclocal.m4 with 100% similarity] patch | blob | history
prepare-source.mak patch | blob | history

diff --git a/.gitignore b/.gitignore
index 948d3f7fba6fd97c2e3154090cafa9e2079b47e9..23bd4d7b2cf05d547839e0c8e32420bc4be20f14 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ config.h.in
 config.h.in.old
 config.log
 config.status
 config.h.in.old
 config.log
 config.status
+aclocal.m4
 /proto.h
 /proto.h-tstamp
 /rsync.1
 /proto.h
 /proto.h-tstamp
 /rsync.1
diff --git a/Makefile.in b/Makefile.in
index d0e0ddedd290b859a7900bb77a8346a64ffd5bd7..a5ea668c328adf4a089b3d54bc8ded9dac1b6820 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,6 +143,9 @@ gensend: gen
 conf:
        cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
 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
 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
similarity index 100%
rename from aclocal.m4
rename to acinclude.m4
diff --git a/prepare-source.mak b/prepare-source.mak
index 054bab70689f29b05f91879409755228739cf176..efb6228390717618ac421f1aa6a2076dd813fa33 100644 (file)
--- a/prepare-source.mak
+++ b/prepare-source.mak
@@ -1,5 +1,8 @@
 conf: configure.sh config.h.in
 
 conf: configure.sh config.h.in
 
+aclocal.m4:
+       aclocal
+
 configure.sh: configure.ac aclocal.m4
        autoconf -o configure.sh
 
 configure.sh: configure.ac aclocal.m4
        autoconf -o configure.sh
 
The rsync repository.