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/23 14:07:28 UTC

cvs commit: apr-util .cvsignore Makefile.in

jorton      2004/06/23 05:07:28

  Modified:    .        .cvsignore Makefile.in
  Log:
  * Makefile.in: Generate export_vars.c not export_vars.h per APR fix
  for SINIX cc -E.
  
  Revision  Changes    Path
  1.22      +1 -1      apr-util/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr-util/.cvsignore,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -d -w -u -r1.21 -r1.22
  --- .cvsignore	14 Jun 2004 15:43:40 -0000	1.21
  +++ .cvsignore	23 Jun 2004 12:07:28 -0000	1.22
  @@ -11,7 +11,7 @@
   libaprutil*.la
   aprutil.exp
   exports.c
  -export_vars.h
  +export_vars.[ch]
   export_vars.sh
   apu-config
   apu-config.out
  
  
  
  1.90      +6 -6      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -d -w -u -r1.89 -r1.90
  --- Makefile.in	23 Jun 2004 11:58:02 -0000	1.89
  +++ Makefile.in	23 Jun 2004 12:07:28 -0000	1.90
  @@ -20,7 +20,7 @@
   EXTRA_SOURCE_DIRS = @APR_XML_DIR@
   EXTRA_OS_LINK=@EXTRA_OS_LINK@
   
  -TARGETS = $(TARGET_LIB) aprutil.exp export_vars.h
  +TARGETS = $(TARGET_LIB) aprutil.exp
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  @@ -28,14 +28,14 @@
   
   CLEAN_SUBDIRS = test
   
  -CLEAN_TARGETS = exports.c export_vars.h aprutil.exp .make.dirs apu-config.out
  +CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out
   DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
   	include/private/apu_config.h include/private/apu_private.h \
   	include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \
   	export_vars.sh apu-config build/rules.mk include/apu_want.h \
   	apr-util.pc
   EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \
  -	exports.c export_vars.h build-outputs.mk \
  +	exports.c build-outputs.mk \
   	build/apr_common.m4 build/find_apr.m4 build/install.sh \
   	build/config.guess build/config.sub
   
  @@ -84,15 +84,15 @@
   exports.c: $(HEADERS)
   	$(AWK) -f $(APR_BUILD_DIR)/make_exports.awk $(HEADERS) > $@
   
  -export_vars.h: $(HEADERS)
  +export_vars.c: $(HEADERS)
   	$(AWK) -f $(APR_BUILD_DIR)/make_var_export.awk $(HEADERS) > $@
   
  -aprutil.exp: exports.c export_vars.h
  +aprutil.exp: exports.c export_vars.c
   	@echo "#! libaprutil.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