diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 64 | ||||
| -rw-r--r-- | bin/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | man/Makefile.am | 2 | ||||
| -rw-r--r-- | share/Makefile.am | 1 | ||||
| -rw-r--r-- | test/Makefile.am | 38 |
7 files changed, 47 insertions, 78 deletions
@@ -40,7 +40,7 @@ test-driver *.t.err *.t.trs *.t.log -test/test-suite.log +test-suite.log # Other generated files man/rcm.7 diff --git a/Makefile.am b/Makefile.am index c245b7a..d4ac330 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,25 +1,47 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = man share bin test EXTRA_DIST = LICENSE README.md NEWS.md -.PHONY: release +dist_bin_SCRIPTS = bin/lsrc bin/mkrc bin/rcup bin/rcdn -release: NEWS.md Makefile distcheck - maint/release build tarball $(DIST_ARCHIVES) - maint/release build homebrew $(DIST_ARCHIVES) - maint/release build arch $(DIST_ARCHIVES) - maint/release build deb $(DIST_ARCHIVES) - maint/release build tag $(DIST_ARCHIVES) - maint/release build man_html $(DIST_ARCHIVES) - maint/release push tarball $(DIST_ARCHIVES) - maint/release push homebrew $(DIST_ARCHIVES) - maint/release push arch $(DIST_ARCHIVES) - maint/release push deb $(DIST_ARCHIVES) - maint/release push tag $(DIST_ARCHIVES) - maint/release push man_html $(DIST_ARCHIVES) - maint/release clean tarball $(DIST_ARCHIVES) - maint/release clean homebrew $(DIST_ARCHIVES) - maint/release clean arch $(DIST_ARCHIVES) - maint/release clean deb $(DIST_ARCHIVES) - maint/release clean tag $(DIST_ARCHIVES) - maint/release clean man_html $(DIST_ARCHIVES) +# When changing this you must also change maint/release.in . +dist_man_MANS = man/lsrc.1 man/mkrc.1 man/rcdn.1 man/rcup.1 man/rcrc.5 man/rcm.7 + +dist_pkgdata_DATA = share/rcm.sh + +TESTS = \ + test/lsrc-dotfiles-dirs.t \ + test/lsrc-excludes.t \ + test/lsrc-hostname.t \ + test/lsrc-sigils.t \ + test/lsrc.t \ + test/lsrc-symlink-dirs.t \ + test/lsrc-tags.t \ + test/lsrc-usage.t \ + test/lsrc-undotted.t \ + test/lsrc-host-tags-default.t \ + test/mkrc-alternate-dotfiles-dir.t \ + test/mkrc-copy-file.t \ + test/mkrc-host-file.t \ + test/mkrc-hostname.t \ + test/mkrc-simple-output.t \ + test/mkrc-symlink-dirs.t \ + test/mkrc-tagged-file.t \ + test/mkrc-usage.t \ + test/mkrc-undotted.t \ + test/rcrc-custom.t \ + test/rcrc-hostname.t \ + test/rcrc.t \ + test/rcup-link-files.t \ + test/rcup-hostname.t \ + test/rcup-standalone.t \ + test/rcup-symlink-dirs.t \ + test/rcup-usage.t \ + test/rcdn-hooks.t \ + test/rcdn-hooks-run-in-situ.t \ + test/rcup-hooks.t \ + test/rcup-hooks-run-in-situ.t + +dist_check_SCRIPTS = $(TESTS) +dist_check_DATA = test/helper.sh + +LOG_COMPILER = cram diff --git a/bin/Makefile.am b/bin/Makefile.am deleted file mode 100644 index 8fcb92b..0000000 --- a/bin/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -dist_bin_SCRIPTS = lsrc mkrc rcup rcdn diff --git a/configure.ac b/configure.ac index a229625..6b060d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,8 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - AC_PREREQ([2.69]) AC_INIT(rcm, 1.3.0, mburns@thoughtbot.com) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([subdir-objects]) -# Checks for programs. +# /bin/sh on Solaris is not POSIX, so try to find another one. case "$host_os" in solaris*) AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh]) @@ -14,12 +11,4 @@ solaris*) esac AC_SUBST([SHELL]) -# Checks for libraries. - -# Checks for header files. - -# Checks for typedefs, structures, and compiler characteristics. - -# Checks for library functions. - -AC_OUTPUT(Makefile bin/Makefile man/Makefile share/Makefile test/Makefile share/rcm.sh arch/git-PKGBUILD NEWS.md bin/lsrc bin/mkrc bin/rcdn bin/rcup maint/release) +AC_OUTPUT(Makefile share/rcm.sh arch/git-PKGBUILD NEWS.md bin/lsrc bin/mkrc bin/rcdn bin/rcup maint/release) diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 20c241e..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# When changing this you must also change maint/release.in . -dist_man_MANS = lsrc.1 mkrc.1 rcdn.1 rcup.1 rcrc.5 rcm.7 diff --git a/share/Makefile.am b/share/Makefile.am deleted file mode 100644 index 49003e2..0000000 --- a/share/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -dist_pkgdata_DATA = rcm.sh diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index d5aa210..0000000 --- a/test/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -TESTS = \ - lsrc-dotfiles-dirs.t \ - lsrc-excludes.t \ - lsrc-hostname.t \ - lsrc-sigils.t \ - lsrc.t \ - lsrc-symlink-dirs.t \ - lsrc-tags.t \ - lsrc-usage.t \ - lsrc-undotted.t \ - lsrc-host-tags-default.t \ - mkrc-alternate-dotfiles-dir.t \ - mkrc-copy-file.t \ - mkrc-host-file.t \ - mkrc-hostname.t \ - mkrc-simple-output.t \ - mkrc-symlink-dirs.t \ - mkrc-tagged-file.t \ - mkrc-usage.t \ - mkrc-undotted.t \ - rcrc-custom.t \ - rcrc-hostname.t \ - rcrc.t \ - rcup-link-files.t \ - rcup-hostname.t \ - rcup-standalone.t \ - rcup-symlink-dirs.t \ - rcup-usage.t \ - rcdn-hooks.t \ - rcdn-hooks-run-in-situ.t \ - rcup-hooks.t \ - rcup-hooks-run-in-situ.t - - -dist_check_SCRIPTS = $(TESTS) -dist_check_DATA = helper.sh - -LOG_COMPILER = cram |