From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 11 Mar 2018 14:49:06 +0000 (+0100)
Subject: Clean up
X-Git-Tag: v3.4.2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2868e5b20dfaf8f041b905cdb82f1cd9ab9aaffe;p=thirdparty%2Fccache.git

Clean up
---

diff --git a/Makefile.in b/Makefile.in
index 4d05d73a3..dd0fc571f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,7 +87,7 @@ files_to_clean = \
     src/zlib/libz.a \
     testdir.* \
     unittest/run$(EXEEXT) \
-    *~ \
+    *~
 
 files_to_distclean = Makefile config.h config.log config.status
 
@@ -138,7 +138,7 @@ unittest/run$(EXEEXT): $(base_objs) $(test_objs) $(extra_libs)
 unittest/main.o: unittest/suites.h
 
 unittest/suites.h: $(test_suites) Makefile
-	sed -n 's/TEST_SUITE(\(.*\))/SUITE(\1)/p' $^ | grep ^SUITE >$@
+	ls $^ | grep -v Makefile | xargs sed -n 's/TEST_SUITE(\(.*\))/SUITE(\1)/p' >$@
 
 .PHONY: check
 check: test
diff --git a/configure.ac b/configure.ac
index 94aede8fb..e2a348d97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT()
 AC_PREREQ(2.52)
 
-AC_MSG_NOTICE([Configuring ccache])
+AC_MSG_NOTICE([configuring ccache])
 
 AC_CONFIG_HEADER(config.h)
 
@@ -155,17 +155,17 @@ if test "$ac_cv_c_extern_inline" != no ; then
               Define to 1 if your compiler supports extern inline)
 fi
 
-mkdir -p src
+mkdir -p .deps src unittest
 
 dnl Enable developer mode if dev.mk.in exists.
 if test ! -f $srcdir/dev_mode_disabled && test "$RUN_FROM_BUILD_FARM" != yes; then
-    AC_MSG_NOTICE(Developer mode enabled)
+    AC_MSG_NOTICE(developer mode enabled)
     AC_CONFIG_FILES([dev.mk])
     include_dev_mk='include dev.mk'
     version=`(git --git-dir=$srcdir/.git describe --dirty 2>/dev/null || echo vunknown) | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g'`
     echo "const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >src/version.c
 else
-    AC_MSG_NOTICE(Developer mode disabled)
+    AC_MSG_NOTICE(developer mode disabled)
 fi
 
 if test ! -f $srcdir/src/version.c -a ! -f src/version.c ; then
@@ -187,7 +187,4 @@ cat config.h >>config.h.tmp
 echo '#endif' >>config.h.tmp
 mv config.h.tmp config.h
 
-mkdir -p .deps unittest
-
-
 AC_MSG_NOTICE(now build ccache by running make)
diff --git a/dev.mk.in b/dev.mk.in
index 53ce2a20b..91b0a578a 100644
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -142,7 +142,7 @@ distcheck: $(firstword $(dist_archives))
 	 ../configure --prefix=$$tmpdir/root && \
 	 $(MAKE) install && \
 	 $(MAKE) installcheck) && \
-	 chmod -R u+w $$tmpdir/$(dist_dir) && \
+	chmod -R u+w $$tmpdir/$(dist_dir) && \
 	rm -rf $$tmpdir
 
 	tmpdir=$$(mktemp -d /tmp/tmp-ccache-distcheck.XXXXXX) && \
@@ -155,18 +155,18 @@ distcheck: $(firstword $(dist_archives))
 	 ../configure --prefix=$$tmpdir/root --with-bundled-zlib && \
 	 $(MAKE) install && \
 	 $(MAKE) installcheck) && \
-	 chmod -R u+w $$tmpdir/$(dist_dir) && \
+	chmod -R u+w $$tmpdir/$(dist_dir) && \
 	rm -rf $$tmpdir
 
 .PHONY: docs
 docs: $(generated_docs)
 
 %.html: %.adoc
-	@mkdir -p `dirname $@`
+	@mkdir -p $(@D)
 	$(ASCIIDOC) -o $@ -a revnumber=$(version) -a toc -b xhtml11 $<
 
 %.xml: %.adoc
-	@mkdir -p `dirname $@`
+	@mkdir -p $(@D)
 # Make literals stand out as bold in the man page:
 	$(ASCIIDOC) -a revnumber=$(version) -d manpage -b docbook -o - $< | \
 	  perl -pe 's!<literal>(.*?)</literal>!<emphasis role="strong">\1</emphasis>!g' >$@