svn commit: r1536840 - in /apr/apr/branches/1.5.x: ./ Makefile.in include/private/

[tr...@apache.org]

Author: trawick
Date: Tue Oct 29 18:37:29 2013
New Revision: 1536840

URL: http://svn.apache.org/r1536840
Log:
Merge remainder of r1536744 from trunk:

trigger the generation of apr_escape_test_char.h during
the build

clean the most critical gen_test_char artifacts
  (.libs still not removed)

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/Makefile.in
    apr/apr/branches/1.5.x/include/private/   (props changed)

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1536744

Modified: apr/apr/branches/1.5.x/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/Makefile.in?rev=1536840&r1=1536839&r2=1536840&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/Makefile.in (original)
+++ apr/apr/branches/1.5.x/Makefile.in Tue Oct 29 18:37:29 2013
@@ -45,7 +45,9 @@ LT_VERSION = @LT_VERSION@
 @INCLUDE_OUTPUTS@
 
 CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
-	build/apr_rules.out tools/gen_test_char@EXEEXT@
+	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+	tools/gen_test_char.o tools/gen_test_char.lo \
+	include/private/apr_escape_test_char.h
 DISTCLEAN_TARGETS = config.cache config.log config.status \
 	include/apr.h include/arch/unix/apr_private.h \
 	libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
@@ -99,6 +101,8 @@ install: $(TARGETS)
 $(TARGET_LIB): $(OBJECTS)
 	$(LINK) @lib_target@ $(ALL_LIBS)
 
+encoding/apr_escape.lo: include/private/apr_escape_test_char.h 
+
 exports.c: $(HEADERS)
 	$(APR_MKEXPORT) $(HEADERS) > $@
 

Propchange: apr/apr/branches/1.5.x/include/private/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 29 18:37:29 2013
@@ -0,0 +1 @@
+apr_escape_test_char.h