Author: danielsh
Date: Mon Apr 4 02:16:57 2011
New Revision: 1088462
URL: http://svn.apache.org/viewvc?rev=1088462&view=rev
Log:
Move the 'check-SWIG' Makefile check to the point that $(SWIG) is first
actually used, to avoid suprious errors otherwise. This replaces
r1054087, and is an attempt to fix issue #3850.
Suggested by: arfrever
* build/generator/templates/makefile.ezt
(Section 4.swig_c.c_file): Depend on 'check-SWIG'.
* Makefile.in
(swig-pl, swig-py, swig-rb): Don't depend on 'check-SWIG'.
* build/generator/gen_make.py
(Generator.write): Same.
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build/generator/gen_make.py
subversion/trunk/build/generator/templates/makefile.ezt
Modified: subversion/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1088462&r1=1088461&r2=1088462&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Mon Apr 4 02:16:57 2011
@@ -740,7 +740,7 @@ READLINK_PL=$(PERL) -e 'use Cwd; print C
swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
$(SWIG_PL_DIR)/native/Makefile
-swig-pl: check-SWIG $(swig-pl_DEPS)
+swig-pl: $(swig-pl_DEPS)
if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL)
$(SWIG_PL_SRC_DIR)`"; then \
ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
fi
@@ -783,7 +783,7 @@ copy-swig-py: autogen-swig-py $(SWIG_PY_
done
@touch $(SWIG_PY_DIR)/libsvn/__init__.py
-swig-py: check-SWIG autogen-swig-py copy-swig-py
+swig-py: autogen-swig-py copy-swig-py
check-swig-py: swig-py
cd $(SWIG_PY_DIR); \
@@ -805,7 +805,7 @@ clean-swig-py:
extraclean-swig-py: clean-swig-py
$(EXTRACLEAN_SWIG_PY)
-swig-rb: check-SWIG autogen-swig-rb
+swig-rb: autogen-swig-rb
check-swig-rb: swig-rb svnserve
cd $(SWIG_RB_DIR); \
Modified: subversion/trunk/build/generator/gen_make.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1088462&r1=1088461&r2=1088462&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Mon Apr 4 02:16:57 2011
@@ -350,11 +350,6 @@ class Generator(gen_base.GeneratorBase):
outputs = [ ]
- # Fake CHECK-SWIG dependency, because these targets are in
- # both Makefile.in AND build-outputs.mk
- if itype == "swig-rb" or itype == "swig-py" or itype == "swig-pl":
- outputs.append('check-SWIG')
-
for t in i_targets:
if hasattr(t, 'filename'):
outputs.append(t.filename)
Modified: subversion/trunk/build/generator/templates/makefile.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/makefile.ezt?rev=1088462&r1=1088461&r2=1088462&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/makefile.ezt (original)
+++ subversion/trunk/build/generator/templates/makefile.ezt Mon Apr 4 02:16:57
2011
@@ -73,7 +73,7 @@ autogen-swig: autogen-swig-[swig_langs.s
# Section 4: Rules to build SWIG .c files from .i files
########################################
[for swig_c]
-[swig_c.c_file]:[for swig_c.deps] [swig_c.deps][end]
+[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]
