You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/06/06 12:20:11 UTC
cvs commit: apr .cvsignore Makefile.in
jorton 2004/06/06 03:20:11
Modified: . Tag: APR_0_9_BRANCH .cvsignore Makefile.in
Log:
Backport from HEAD:
* Makefile.in: Remove files generated during 'make' in the 'clean'
target.
* Makefile.in: Rename export_vars.h to export_vars.c to fix build on
SINIX, where cc -E fails on header files.
PR: 29169
Revision Changes Path
No revision
No revision
1.16.2.1 +1 -1 apr/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -d -w -u -r1.16 -r1.16.2.1
--- .cvsignore 8 Dec 2002 17:16:25 -0000 1.16
+++ .cvsignore 6 Jun 2004 10:20:11 -0000 1.16.2.1
@@ -14,7 +14,7 @@
*.plg
apr.exp
exports.c
-export_vars.h
+export_vars.[ch]
.libs
.deps
*.la
1.87.2.2 +6 -6 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.87.2.1
retrieving revision 1.87.2.2
diff -d -w -u -r1.87.2.1 -r1.87.2.2
--- Makefile.in 15 Nov 2003 23:42:33 -0000 1.87.2.1
+++ Makefile.in 6 Jun 2004 10:20:11 -0000 1.87.2.2
@@ -26,15 +26,15 @@
# Rules for building specific targets, starting with 'all' for
# building the entire package.
#
-TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.h apr.exp
+TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.c apr.exp
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
-CLEAN_TARGETS =
+CLEAN_TARGETS = apr.exp exports.c export_vars.c
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
- libtool apr.exp apr-config exports.c export_vars.h
+ libtool apr-config
EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in
prefix=@prefix@
@@ -117,15 +117,15 @@
exports.c:
$(AWK) -f $(top_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@
-export_vars.h:
+export_vars.c:
$(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@
-apr.exp: exports.c export_vars.h
+apr.exp: exports.c export_vars.c
@echo "#! lib@APR_LIBNAME@.so" > $@
@echo "* This file was AUTOGENERATED at build time." >> $@
@echo "* Please do not edit by hand." >> $@
$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
- $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
dox:
doxygen $(top_srcdir)/docs/doxygen.conf