Changeset 874 for trunk/Makefile.am


Ignore:
Timestamp:
Nov 22, 2009, 11:53:21 PM (12 years ago)
Author:
Peter Johansson
Message:

merging release 0.7. Delta /tags/0.7 - /branches/0.7-stable@848

Due to problems with 'svn merge' (skipping added files?), I've copied
added files manually.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r853 r874  
    3232  rm -rf svndigest *~
    3333
    34 if ENABLE_SVN_SUPPORT
    35 include build_support/svn_support.am
    36 else
    37 release:
    38   @echo "ERROR: target 'release' not activated."
    39   @echo "       You need to run configure with '--enable-svn-support'."
    40   @exit 1
    41 endif
    42 
    43 
    4434# This is a workaround to avoid a broken make when .m4 files are
    4535# renamed or deleted. Something similar will be provided by Automake 1.11
    4636$(am__aclocal_m4_deps):
    4737
    48 ## FIXME remove this (when 0.7 has been merged into trunk)
    49 # avoid broken Makefile at future removal of am file
    50 $(srcdir)/build_support/svn_support.am:
     38##############################################################
     39##
     40## Some rules useful for maintainer
     41##
     42
     43include $(srcdir)/maintainer.am
     44
     45# called within maintainer-check
     46## We do wanna run all tests here since test repository is not
     47## included in tarball, and thus some tests are skiped in distcheck.
     48MAINTAINER_CHECK_LOCAL = all check
     49# extra check in release rule
     50#RELEASE_LOCAL =
Note: See TracChangeset for help on using the changeset viewer.