apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@locus.apache.org
Subject cvs commit: apr buildconf Makefile.in
Date Tue, 12 Dec 2000 12:03:42 GMT
gstein      00/12/12 04:03:42

  Modified:    .        buildconf Makefile.in
  Log:
  auto-rebuild the exports file when a header changes
  
  Revision  Changes    Path
  1.5       +2 -4      apr/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/apr/buildconf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- buildconf	2000/12/01 15:45:24	1.4
  +++ buildconf	2000/12/12 12:03:41	1.5
  @@ -1,8 +1,6 @@
   #!/bin/sh
   
  -autoconf;autoheader
  +autoheader
  +autoconf
   
   (cd shmem/unix/mm && autoconf)
  -
  -perl ./helpers/make_export.pl -o ./apr.exports include/*.h
  -
  
  
  
  1.32      +22 -7     apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -u -r1.31 -r1.32
  --- Makefile.in	2000/12/03 03:54:01	1.31
  +++ Makefile.in	2000/12/12 12:03:41	1.32
  @@ -31,6 +31,8 @@
   
   LIBAPR = @LIBPREFIX@apr.a
   
  +TARGET_EXPORTS = apr.exports
  +
   #
   # Rules for turning inputs into outputs
   #
  @@ -41,7 +43,7 @@
   # Rules for building specific targets, starting with 'all' for
   # building the entire package.
   #
  -all: Makefile $(LIBAPR)
  +all: Makefile $(LIBAPR) delete-exports $(TARGET_EXPORTS)
   
   $(LIBAPR): $(MODULES) subdirs
   	@rm -rf objs
  @@ -52,19 +54,22 @@
   	$(RANLIB) $@
   
   clean: subdirs_clean
  -	$(RM) -f *.o *.a *.so objs/*.o
  +	$(RM) -f *.o *.a *.so objs/*.o apr.exports
   
   depend: subdirs_depend
   
   distclean: subdirs_distclean
  -	-$(RM) -f include/apr.h include/apr_private.h include/apr_private.h.in
  +	-$(RM) -f include/apr.h include/arch/unix/apr_private.h
   	-$(RM) -f *.o *.a *.so
  -	-$(RM) -f config.cache config.status config.log configure apr.exports
  +	-$(RM) -f config.cache config.status config.log
   	-$(RM) -f Makefile
   	-$(RM) -f APRVARS
   	-$(RM) -rf objs
   	cd test; $(MAKE) distclean; cd ..
   
  +extraclean: distclean
  +	-$(RM) -f configure include/arch/unix/apr_private.h.in
  +
   subdirs:
   	@for i in $(SUBDIRS); do \
   	    echo "===> $(SDP)lib/apr/$$i"; \
  @@ -100,9 +105,19 @@
   
   install: all
   
  -exports:
  -	perl ./helpers/make_export.pl -o ./apr.exports include/*.h
  +delete-exports:
  +	@if test -f $(TARGET_EXPORTS); then \
  +	    headers="`find include/*.h -maxdepth 0 -newer $(TARGET_EXPORTS)`" ; \
  +	    if test -n "$$headers"; then \
  +		echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
  +		echo $(RM) -f $(TARGET_EXPORTS) ; \
  +		$(RM) -f $(TARGET_EXPORTS) ; \
  +	    fi \
  +	fi
   
  +$(TARGET_EXPORTS):
  +	perl ./helpers/make_export.pl -o $@ include/*.h
  +
   docs:
   	./helpers/scandoc -i./helpers/default.pl -p./docs/ ./include/*.h
   
  @@ -116,6 +131,6 @@
   	        break; \
   	    fi \
   	done )
  -	
  +
   # DO NOT REMOVE
   docs: $(INCDIR)/*.h
  
  
  

Mime
View raw message