You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/04/04 07:13:16 UTC

svn commit: r1088476 - in /subversion/trunk: Makefile.in build/generator/templates/makefile.ezt

Author: danielsh
Date: Mon Apr  4 05:13:16 2011
New Revision: 1088476

URL: http://svn.apache.org/viewvc?rev=1088476&view=rev
Log:
Move the 'check-SWIG' target to build-outputs.mk.

Without this change, './autogen.sh --release' fails to find the 'check-SWIG'
target.

* build/generator/templates/makefile.ezt
  (check-SWIG): Moved from..
* Makefile.in
  (check-SWIG): .. here.

Modified:
    subversion/trunk/Makefile.in
    subversion/trunk/build/generator/templates/makefile.ezt

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1088476&r1=1088475&r2=1088476&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Mon Apr  4 05:13:16 2011
@@ -706,12 +706,6 @@ install-man:
 install-swig-py: install-swig-py-lib
 install-swig-rb: install-swig-rb-lib
 
-check-SWIG:
-	if [ "$(SWIG)" = "none" ]; then \
-	  echo "SWIG disabled at configure time" >&2; \
-	  exit 1; \
-	fi
-
 clean-swig: clean-swig-headers clean-swig-py clean-swig-rb clean-swig-pl
 extraclean-swig: extraclean-swig-headers extraclean-swig-py \
                  extraclean-swig-rb extraclean-swig-pl

Modified: subversion/trunk/build/generator/templates/makefile.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/makefile.ezt?rev=1088476&r1=1088475&r2=1088476&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/makefile.ezt (original)
+++ subversion/trunk/build/generator/templates/makefile.ezt Mon Apr  4 05:13:16 2011
@@ -76,6 +76,14 @@ autogen-swig: autogen-swig-[swig_langs.s
 [swig_c.c_file]: check-SWIG [for swig_c.deps] [swig_c.deps][end]
 	$(SWIG) $(SWIG_INCLUDES) [swig_c.opts] -o $@ $(top_srcdir)/[swig_c.source][end]
 
+# This needs to be here, rather than in Makefile.in, else
+# './autogen.sh --release' doesn't find it.
+check-SWIG:
+	if [ "$(SWIG)" = "none" ]; then \
+	  echo "SWIG disabled at configure time" >&2; \
+	  exit 1; \
+	fi
+
 
 ########################################
 # Section 5: Individual target build rules