Changeset 1308

Timestamp:

Nov 16, 2010, 3:18:56 AM (11 years ago)

Author:

Peter Johansson

Message:

fixing distcheck issues. Adding missing header files into dist and move readme_test into rule 'check-readme' run during 'make release'.

Location:

trunk

Files:

• Makefile.am (modified) (2 diffs)
• bin/Makefile.am (modified) (1 diff)
• lib/Makefile.am (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/readme_test.sh (deleted)

trunk/Makefile.am

@@ -63 +63 @@
 MAINTAINER_CHECK_LOCAL = check
 # extra check in release rule
-RELEASE_LOCAL = check-svn_revision
+RELEASE_LOCAL = check-svn_revision check-readme
 
 .PHONY: check-svn_revision
@@ -71 +71 @@
   { echo incorrect svn revision - expected single unmodified revision 1>&2; \
     exit 1; }
+
+check-readme:
+  (ver_am=1.11\
+  && $(GREP) "AM_INIT_AUTOMAKE.*$$ver_am" $(srcdir)/configure.ac \
+  && $(GREP) "Automake $$ver_am" $(srcdir)/README.developer)>/dev/null || exit 1
+  (ver_ac=2.63\
+  && $(GREP) "AC_PREREQ.*$$ver_ac" $(srcdir)/configure.ac \
+  && $(GREP) "Autoconf $$ver_ac" $(srcdir)/README.developer)>/dev/null || exit 1
+
+
 
 # run in end of release target

trunk/bin/Makefile.am

@@ -30 +30 @@
   svncopyrightParameter.cc svncopyright.cc
 
-noinst_HEADERS = Parameter.h svncopyrightParameter.h svndigestParameter.h
+noinst_HEADERS = 
+noinst_HEADERS += AbstractParameter.h 
+noinst_HEADERS += Parameter.h 
+noinst_HEADERS += svncopyrightParameter.h 
+noinst_HEADERS += svndigestParameter.h
+noinst_HEADERS += svndigest_copy_cacheParameter.h
 
 LDADD = $(top_builddir)/lib/libsvndigest_core.a \

trunk/lib/Makefile.am

@@ -39 +39 @@
   main_utility.h Node.h NodeCounter.h NodePrinter.h NodeVisitor.h \
   OptionVersion.h rmdirhier.h \
-  Stats.h StatsCollection.h subversion_info.h \
+  Stats.h StatsCollection.h StatsPlotter.h subversion_info.h \
   SvndigestVisitor.h SVN.h SVNblame.h \
   SVNdiff.h SVNinfo.h SVNlog.h SVNproperty.h TinyStats.h \

trunk/test/Makefile.am

@@ -43 +43 @@
 distributed_TESTS += error_test.sh
 distributed_TESTS += link_root_test.sh
-distributed_TESTS += readme_test.sh
 distributed_TESTS += repo_status_test.sh
 distributed_TESTS += repo_test.sh
@@ -94 +93 @@
 config3_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT)
 copyright2_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
-repo_status_test.log:init.sh $(top_builddir)/README.developer \
-  $(top_builddir)/configure.ac
 repo_status_test.log:init.sh 
 repo_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)