Clean up generated files.

Remove src/or/or_sha1.i and src/common/common_sha1.i on `make clean` and remove
the temporary micro-revision file when its no longer needed.

Additional changes;
- show a message when generating the micro-revision file.
- add the temporary micro revision file to the list of files to be removed on
  `make clean` just in case.
- fix indentation of the make rule to improve readability.

diff --git a/src/common/include.am b/src/common/include.am
index 5b63392541573378ae70b80aded24e967bc1eb90..cad0fe1b5434ab952fa8ce97855a075ce88b6641 100644 (file)
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -133,7 +133,7 @@ COMMONHEADERS = \
 
 noinst_HEADERS+= $(COMMONHEADERS)
 
-DISTCLEANFILES+= src/common/common_sha1.i
+CLEANFILES+= src/common/common_sha1.i
 
 src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEADERS)
        $(AM_V_GEN)if test "@SHA1SUM@" != none; then \

diff --git a/src/or/include.am b/src/or/include.am
index 47746e22de7a89bbdb777dadf6189f5d595d946a..068519e1fb6aa5875bb51dd4650df913c96063e0 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -193,20 +193,22 @@ noinst_HEADERS+= $(ORHEADERS) micro-revision.i
 src/or/config_codedigest.o: src/or/or_sha1.i
 
 micro-revision.i: FORCE
-       @rm -f micro-revision.tmp;                              \
-       if test -d "$(top_srcdir)/.git" &&                              \
-         test -x "`which git 2>&1;true`"; then                         \
-         HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \
-         echo \"$$HASH\" > micro-revision.tmp;                         \
-        fi;                                                            \
-       if test ! -f micro-revision.tmp ; then                  \
-         if test ! -f micro-revision.i ; then                  \
-           echo '""' > micro-revision.i;                       \
-         fi;                                                           \
-       elif test ! -f micro-revision.i ||                      \
-         test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \
-         mv micro-revision.tmp micro-revision.i;               \
-       fi; true
+       $(AM_V_GEN)rm -f micro-revision.tmp; \
+       if test -d "$(top_srcdir)/.git" && \
+                       test -x "`which git 2>&1;true`"; then \
+               HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \
+               echo \"$$HASH\" > micro-revision.tmp; \
+       fi; \
+       if test ! -f micro-revision.tmp; then \
+               if test ! -f micro-revision.i; then \
+                       echo '""' > micro-revision.i; \
+               fi; \
+       elif test ! -f micro-revision.i || \
+                       test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \
+               mv micro-revision.tmp micro-revision.i; \
+       fi; \
+       rm -f micro-revision.tmp; \
+       true
 
 src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS)
        $(AM_V_GEN)if test "@SHA1SUM@" != none; then \
@@ -220,6 +222,6 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS)
          touch src/or/or_sha1.i; \
        fi
 
-CLEANFILES+= micro-revision.i src/or/micro-revision.i
+CLEANFILES+= src/or/or_sha1.i micro-revision.i src/or/micro-revision.i micro-revision.tmp
 
 FORCE: