You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2012/03/16 22:05:14 UTC
svn commit: r1301760 - /subversion/trunk/Makefile.in
Author: gstein
Date: Fri Mar 16 21:05:14 2012
New Revision: 1301760
URL: http://svn.apache.org/viewvc?rev=1301760&view=rev
Log:
Trim out some silly targets related to distclean and extraclean.
There are some extraclean-* targets left, which is more related to
organizing the complexity, than to provide users with valid targets.
* Makefile.in:
(fast-distclean): removed
(extraclean-javahl): removed
(extraclean-external): folded into the external-(clean|distclean) rule
(extraclean-swig): removed. folded into extraclean-bindings
(extraclean-ctypes-python): removed
Modified:
subversion/trunk/Makefile.in
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1301760&r1=1301759&r2=1301760&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Fri Mar 16 21:05:14 2012
@@ -381,17 +381,18 @@ fast-clean: doc-clean
$(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline/svntest \
-name "*.pyc" -exec rm {} ';'
-# clean all but bulky test output, returning to before './configure' was run.
+# clean everything, returning to before './configure' was run.
SVN_CONFIG_SCRIPT_FILES = @SVN_CONFIG_SCRIPT_FILES@
-fast-distclean: fast-clean
+local-distclean: local-clean
rm -fr config.cache config.log config.nice config.status \
- libtool mkmf.log subversion/svn_private_config.h \
- subversion/bindings/javahl/classes subversion/bindings/javahl/include \
+ libtool mkmf.log subversion/svn_private_config.h \
+ subversion/bindings/javahl/classes \
+ subversion/bindings/javahl/include \
$(SVN_CONFIG_SCRIPT_FILES)
rm -f Makefile
# clean everything out, returning to before './autogen.sh' was run.
-local-extraclean: extraclean-bindings fast-distclean
+local-extraclean: extraclean-bindings local-distclean
rm -f $(top_srcdir)/build-outputs.mk \
$(top_srcdir)/subversion/svn_private_config.h.in \
$(top_srcdir)/configure \
@@ -411,9 +412,6 @@ local-extraclean: extraclean-bindings fa
# clean everything, including test output.
local-clean: check-clean clean-bindings fast-clean
-# clean everything, including test output.
-local-distclean: check-clean clean-bindings fast-distclean
-
local-install: @INSTALL_RULES@
revision-install:
@@ -438,8 +436,6 @@ clean-javahl:
rm -f $(libsvnjavahl_PATH)/*.lo
rm -f $(libsvnjavahl_PATH)/*.o
-extraclean-javahl: clean-javahl
-
check-tigris-javahl: javahl-compat
@FIX_JAVAHL_LIB@
$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
@@ -576,36 +572,24 @@ external-all external-install:
done;
### apr-util relies on generated files in apr, so reverse the
-### list so that it is cleaned before apr.
-external-clean external-distclean:
+### list so that it is cleaned before apr. also note that Neon does
+### not have an extraclean target, so get "close" with distclean
+external-clean external-distclean external-extraclean:
@target=`echo $@ | sed s/external-//`; \
list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)'; \
for i in $$list; do \
revlist="$$i $$revlist"; \
done; \
for i in $$revlist; do \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- done;
-
-### temporary hack. Neon does not have an "extraclean" and neither does db
-### If we don't have extraclean -- do the next best thing.
-external-extraclean:
- @list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)'; \
- for i in $$list; do \
- revlist="$$i $$revlist"; \
- done; \
- for i in $$revlist; do \
- if test "$$i" = "neon" || test "$$i" = "db/dist"; then \
- echo "------ making distclean(no extraclean) in $$i"; \
+ if test "$$i" = "neon" -a "$$target" = "extraclean"; then \
+ echo "------ making distclean (no extraclean) in $$i"; \
(cd $$i && $(MAKE) distclean) || exit 1; \
- echo "------ completed distclean(no extraclean) in $$i"; \
+ echo "------ completed distclean (no extraclean) in $$i"; \
else \
- echo "------ making extraclean in $$i"; \
- (cd $$i && $(MAKE) extraclean) || exit 1; \
- echo "------ completed extraclean in $$i"; \
- fi; \
+ echo "------ making $$target in $$i"; \
+ (cd $$i && $(MAKE) $$target) || exit 1; \
+ echo "------ completed $$target in $$i"; \
+ fi; \
done;
@@ -732,14 +716,14 @@ install-swig-rb: install-swig-rb-lib
clean-bindings: clean-swig clean-ctypes-python clean-javahl
-extraclean-bindings: extraclean-swig extraclean-ctypes-python extraclean-javahl
+extraclean-bindings: clean-swig extraclean-swig-headers \
+ extraclean-swig-py extraclean-swig-rb \
+ extraclean-swig-pl \
+ clean-ctypes-python clean-javahl \
clean-swig: clean-swig-headers clean-swig-py clean-swig-rb clean-swig-pl
@rm -f .swig_checked
-extraclean-swig: clean-swig extraclean-swig-headers extraclean-swig-py \
- extraclean-swig-rb extraclean-swig-pl
-
EXTRACLEAN_SWIG_HEADERS=rm -f $(SWIG_SRC_DIR)/proxy/*.swg
clean-swig-headers:
@@ -872,8 +856,6 @@ clean-ctypes-python:
cd $(CTYPES_PYTHON_SRC_DIR); \
$(PYTHON) setup.py clean --all
-extraclean-ctypes-python: clean-ctypes-python
-
# manually describe a dependency, which we won't otherwise detect
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql