[Monotone-commits-diffs] net.venge.monotone: 154c0bf31c4391e69aeb51dd411bc0b2cfb3e21f

[code]

revision:            154c0bf31c4391e69aeb51dd411bc0b2cfb3e21f
date:                2011-02-23T13:04:04
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
Ongoing cleanup of Makefile.am.

* Makefile.am: Reorganise a few variables for clarity.
  (testers): Have this target use $(check_PROGRAMS) instead of
  enumerating them again.
  (mostlyclean-tests): Don't remove run_*_tests and test/*.status in thsi
  target.  Instead, move them to...
  (MOSTLYCLEANFILES): ... this variable.  Also, mention mtn.1 here, or it
  doesn't get properly cleaned.
  (CLEANFILES): $(BUILT_SOURCES) is cleaned in 'make maintainer-clean',
  don't remove them as part of 'make clean'.
  (MAINTAINERCLEANFILES): Add src/package_revision.txt and
  src/package_full_revision_dist.txt.

manifest:
format_version "1"

new_manifest [236712cb9b4b5ef061d4af490097332f9d7cd3f6]

old_revision [f4d9bcaf766015c4edec0ab2b742d735c7cba13a]

patch "Makefile.am"
 from [2070137b061b337f4a8c8a78b4a85c7d84c68228]
   to [8dd83453a5567b7657c91a0e375433564c218402]
============================================================
--- Makefile.am	2070137b061b337f4a8c8a78b4a85c7d84c68228
+++ Makefile.am	8dd83453a5567b7657c91a0e375433564c218402
@@ -218,26 +218,26 @@ bin_PROGRAMS = mtn
 # primaries
 
 bin_PROGRAMS = mtn
+mtn_SOURCES = $(MOST_SOURCES) src/monotone.cc
+nodist_mtn_SOURCES = src/std_hooks.cc src/schema.cc
+
 noinst_PROGRAMS = util/txt2c
+util_txt2c_SOURCES = util/txt2c.cc
+
 EXTRA_PROGRAMS =
 
 bin_SCRIPTS = mtnopt
 dist_bin_SCRIPTS = extra/bin/mtn-cleanup
 noinst_SCRIPTS = extra/building/dump-test-logs.sh
 
-mtn_SOURCES = $(MOST_SOURCES) src/monotone.cc
-nodist_mtn_SOURCES = src/std_hooks.cc src/schema.cc
-
+check_PROGRAMS = test/bin/unit_tester test/bin/tester test/bin/check_net
 test_bin_unit_tester_SOURCES = $(UNIT_TESTERS) $(UNIT_TESTERS_PRIV) \
 	$(UNIT_TESTEES) $(UNIT_TEST_SUPPORT)
-
 test_bin_tester_SOURCES = test/src/tester.cc test/src/tester-plaf.hh src/transforms.cc src/gzip.cc \
 	$(SANITY_CORE_SOURCES) $(LUAEXT_SOURCES) src/pcrewrap.cc \
 	src/specialized_lexical_cast.cc
 nodist_test_bin_tester_SOURCES = test/src/testlib.cc
 
-util_txt2c_SOURCES = util/txt2c.cc
-
 noinst_LIBRARIES = src/libplatform.a src/lib3rdparty.a
 src_libplatform_a_SOURCES = src/platform.hh
 src_lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \
@@ -653,12 +653,9 @@ test/func.status : mtn$(EXEEXT) test/bin
 
 # Creates the needed artifacts for manual test execution
 .PHONY: testers
-testers: mtn$(EXEEXT) test/bin/tester$(EXEEXT) test/bin/unit_tester$(EXEEXT) \
-	test/bin/check_net$(EXEEXT) \
+testers: mtn$(EXEEXT) $(check_PROGRAMS)
 	run_tester_tests run_func_tests run_unit_tests run_extra_tests
 
-check_PROGRAMS = test/bin/unit_tester test/bin/tester test/bin/check_net
-
 # We want the tests re-run even if the .status files already exist.
 # .PHONY does not work for that (bad interaction with pattern rules),
 # but the FORCE hack does.
@@ -672,7 +669,6 @@ mostlyclean-tests:
 .PHONY: mostlyclean-tests
 mostlyclean-tests:
 	rm -rf test/work
-	rm -f run_*_tests test/*.status
 	@ls test/unit/tests/*/__driver__.lua 2>/dev/null | while read d; do \
 	  echo " rm -f '$$d'"; \
 	  rm -f $$d; \
@@ -680,7 +676,9 @@ mostlyclean-tests:
 	  rmdir $${d%/*} || :; \
 	done
 
-DISTCLEANFILES = src/xgettext.opts src/pch-build.hh.gch.dep
+MOSTLYCLEANFILES = mtn.1 \
+	run_tester_tests   run_func_tests   run_unit_tests   run_extra_tests \
+	test/tester.status test/func.status test/unit.status test/extra.status
 
 # we generate some source files to copy data into the executable
 # note that the only things that should go in BUILT_SRCS are things
@@ -697,13 +695,18 @@ CLEANFILES = $(bin_SCRIPTS) $(noinst_SCR
 BUILT_SOURCES = $(PCH_FILE) $(PCH_BUILD)
 
 CLEANFILES = $(bin_SCRIPTS) $(noinst_SCRIPTS) $(bashcomp_DATA) \
-	$(BUILT_SOURCES) $(CLEAN_SRCS) $(CLEAN_POFILES)
+	$(CLEAN_SRCS) $(CLEAN_POFILES)
 
+DISTCLEANFILES = src/xgettext.opts src/pch-build.hh.gch.dep
+
 # We make GMO files part of the source distribution.  This means we can't
 # clean them away like other files, but a maintainer might still want to
 # get rid of them to rebuild them.
+# The same goes for src/package_revision.txt and
+# src/package_full_revision_dist.txt
 
-MAINTAINERCLEANFILES = $(MAINTAINERCLEAN_POFILES)
+MAINTAINERCLEANFILES = $(MAINTAINERCLEAN_POFILES) \
+	src/package_revision.txt src/package_full_revision_dist.txt
 
 # automake provides no nice way to build a helper program to execute
 # on the build machine, so we need our own rule.  almost all the