apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject cvs commit: apr/build apr_rules.mk.in .cvsignore rules.mk.in
Date Tue, 04 Feb 2003 20:56:16 GMT
thommay     2003/02/04 12:56:16

  Modified:    .        CHANGES Makefile.in configure.in
               build    .cvsignore
  Added:       build    apr_rules.mk.in
  Removed:     build    rules.mk.in
  Log:
  Rename rules.mk to apr_rules.mk and make it be installed.
  
  Revision  Changes    Path
  1.373     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.372
  retrieving revision 1.373
  diff -u -r1.372 -r1.373
  --- CHANGES	4 Feb 2003 20:12:28 -0000	1.372
  +++ CHANGES	4 Feb 2003 20:56:15 -0000	1.373
  @@ -1,5 +1,8 @@
   Changes with APR 0.9.2
   
  +  *) Rename rules.mk to apr_rules.mk and make apr_rules.mk be installed.
  +     [Thom May]
  +     
     *) Fix a bug in apr_proc_create() that could cause a new child process
        to run the parent's code if setrlimit() fails.  [Jeff Trawick]
   
  
  
  
  1.86      +4 -0      apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- Makefile.in	11 Oct 2002 10:55:59 -0000	1.85
  +++ Makefile.in	4 Feb 2003 20:56:15 -0000	1.86
  @@ -84,6 +84,10 @@
   	if [ -f shlibtool ]; then \
   		$(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \
   	fi;
  +	if [ -f build/apr_rules.mk ]; then \
  +		cp build/apr_rules.mk $(DESTDIR)$(installbuilddir); \
  +	fi;
  +
   	if [ ! -d $(DESTDIR)$(bindir) ]; then \
   	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \
   	fi;
  
  
  
  1.511     +5 -5      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.510
  retrieving revision 1.511
  diff -u -r1.510 -r1.511
  --- configure.in	1 Feb 2003 12:21:15 -0000	1.510
  +++ configure.in	4 Feb 2003 20:56:15 -0000	1.511
  @@ -55,7 +55,7 @@
   AC_SUBST(top_builddir)
   
   # Directory containing apr build macros, helpers, and make rules
  -# NOTE: make rules (rules.mk) will be in the builddir for vpath
  +# NOTE: make rules (apr_rules.mk) will be in the builddir for vpath
   #
   apr_buildout=$apr_builddir/build
   apr_builders=$apr_srcdir/build
  @@ -1889,14 +1889,14 @@
   *bsdi*)
       # Check whether they've installed GNU make
       if make --version > /dev/null 2>&1; then 
  -	INCLUDE_RULES="include $apr_buildout/rules.mk"
  +	INCLUDE_RULES="include $apr_buildout/apr_rules.mk"
       else
   	# BSDi make
  -	INCLUDE_RULES=".include \"$apr_buildout/rules.mk\""
  +	INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\""
       fi
       ;;
   *)
  -    INCLUDE_RULES="include $apr_buildout/rules.mk"
  +    INCLUDE_RULES="include $apr_buildout/apr_rules.mk"
       ;;
   esac
   AC_SUBST(INCLUDE_RULES)
  @@ -1913,7 +1913,7 @@
   AC_OUTPUT([
   	$MAKEFILE1 $MAKEFILE2 $MAKEFILE3
   	include/apr.h
  -	build/rules.mk
  +	build/apr_rules.mk
   	apr-config
   ],[
   for i in $SAVE_FILES; do
  
  
  
  1.9       +1 -0      apr/build/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr/build/.cvsignore,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- .cvsignore	8 Dec 2002 17:19:22 -0000	1.8
  +++ .cvsignore	4 Feb 2003 20:56:16 -0000	1.9
  @@ -4,6 +4,7 @@
   ltmain.sh
   ltcf-c.sh
   rules.mk
  +apr_rules.mk
   LibD
   LibR
   Debug
  
  
  
  1.1                  apr/build/apr_rules.mk.in
  
  Index: apr_rules.mk.in
  ===================================================================
  # ====================================================================
  # The Apache Software License, Version 1.1
  #
  # Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  # reserved.
  #
  # Redistribution and use in source and binary forms, with or without
  # modification, are permitted provided that the following conditions
  # are met:
  #
  # 1. Redistributions of source code must retain the above copyright
  #    notice, this list of conditions and the following disclaimer.
  #
  # 2. Redistributions in binary form must reproduce the above copyright
  #    notice, this list of conditions and the following disclaimer in
  #    the documentation and/or other materials provided with the
  #    distribution.
  #
  # 3. The end-user documentation included with the redistribution,
  #    if any, must include the following acknowledgment:
  #       "This product includes software developed by the
  #        Apache Software Foundation (http://www.apache.org/)."
  #    Alternately, this acknowledgment may appear in the software itself,
  #    if and wherever such third-party acknowledgments normally appear.
  #
  # 4. The names "Apache" and "Apache Software Foundation" must
  #    not be used to endorse or promote products derived from this
  #    software without prior written permission. For written
  #    permission, please contact apache@apache.org.
  #
  # 5. Products derived from this software may not be called "Apache",
  #    nor may "Apache" appear in their name, without prior written
  #    permission of the Apache Software Foundation.
  #
  # THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  # DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  # ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  # USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  # SUCH DAMAGE.
  # ====================================================================
  #
  # This software consists of voluntary contributions made by many
  # individuals on behalf of the Apache Software Foundation.  For more
  # information on the Apache Software Foundation, please see
  # <http://www.apache.org/>.
  #
  
  #
  # rules.mk: standard rules for APR
  #
  
  @SET_MAKE@
  
  #
  # Configuration variables
  #
  apr_builddir=@apr_builddir@
  apr_builders=@apr_builders@
  
  # Some layouts require knowing what version we are at.
  APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
  APR_DOTTED_VERSION=@APR_DOTTED_VERSION@
  
  CC=@CC@
  RM=@RM@
  AWK=@AWK@
  SHELL=@SHELL@
  LIBTOOL=@LIBTOOL@
  
  # compilation and linking flags that are supposed to be set only by the user.
  # configure adds to them for tests, but we restore them at the end.
  #
  CFLAGS=@CFLAGS@
  CPPFLAGS=@CPPFLAGS@
  LDFLAGS=@LDFLAGS@
  LIBS=@LIBS@
  DEFS=@DEFS@
  
  # anything added to the standard flags by configure is moved to EXTRA_*
  # at the end of the process.
  #
  EXTRA_CFLAGS=@EXTRA_CFLAGS@
  EXTRA_CPPFLAGS=@EXTRA_CPPFLAGS@
  EXTRA_LDFLAGS=@EXTRA_LDFLAGS@
  EXTRA_LIBS=@EXTRA_LIBS@
  EXTRA_INCLUDES=@EXTRA_INCLUDES@
  
  # NOTEST_* are flags and libraries that can be added by the user without
  # causing them to be used in configure tests (necessary for things like
  # -Werror and other strict warnings that maintainers like to use).
  #
  NOTEST_CFLAGS=@NOTEST_CFLAGS@
  NOTEST_CPPFLAGS=@NOTEST_CPPFLAGS@
  NOTEST_LDFLAGS=@NOTEST_LDFLAGS@
  NOTEST_LIBS=@NOTEST_LIBS@
  
  # Finally, combine all of the flags together in the proper order so that
  # the user-defined flags can always override the configure ones, if needed.
  # Note that includes are listed after the flags because -I options have
  # left-to-right precedence and CPPFLAGS may include user-defined overrides.
  #
  ALL_CFLAGS   = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
  ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
  ALL_LDFLAGS  = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
  ALL_LIBS     = $(LIBS) $(NOTEST_LIBS) $(EXTRA_LIBS)
  ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
  
  LTFLAGS      = @LTFLAGS@
  LT_LDFLAGS   = @LT_LDFLAGS@
  
  #
  # Basic macro setup
  #
  COMPILE      = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
  LT_COMPILE   = @lt_compile@
  
  LINK         = @link@
  
  MKEXPORT     = $(AWK) -f $(apr_builders)/make_export.awk
  MKDEP        = @MKDEP@
  
  #
  # Standard build rules
  #
  all: all-recursive
  depend: depend-recursive
  clean: clean-recursive
  distclean: distclean-recursive
  extraclean: extraclean-recursive
  
  install: all-recursive
  
  
  all-recursive depend-recursive:
  	@otarget=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; \
  	for i in $$list; do \
  	    if test -d "$$i"; then \
  		target="$$otarget"; \
  		echo "Making $$target in $$i"; \
  		if test "$$i" = "."; then \
  		    made_local=yes; \
  		    target="local-$$target"; \
  		fi; \
  		(cd $$i && $(MAKE) $$target) || exit 1; \
  	    fi; \
  	done; \
          if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
  	    made_local=yes; \
  	fi; \
  	if test "$$made_local" != "yes"; then \
  	    $(MAKE) "local-$$otarget" || exit 1; \
  	fi
  
  clean-recursive distclean-recursive extraclean-recursive:
  	@otarget=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \
  	for i in $$list; do \
  	    if test -d "$$i"; then \
  		target="$$otarget"; \
  		echo "Making $$target in $$i"; \
  		if test "$$i" = "."; then \
  		    made_local=yes; \
  		    target="local-$$target"; \
  		fi; \
  		(cd $$i && $(MAKE) $$target); \
  	    fi; \
  	done; \
          if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
  	    made_local=yes; \
  	fi; \
  	if test "$$made_local" != "yes"; then \
  	    $(MAKE) "local-$$otarget"; \
  	fi
  
  # autoconf 2.5x is creating a 'autom4te.cache' directory
  # In case someone ran autoconf by hand, get rid of that directory
  # aswell.
  local-clean: x-local-clean
  	$(RM) -f *.o *.lo *.a *.la *.so *.obj $(CLEAN_TARGETS) $(PROGRAMS)
  	$(RM) -rf .libs autom4te.cache
  
  local-distclean: local-clean x-local-distclean
  	$(RM) -f Makefile $(DISTCLEAN_TARGETS)
  
  local-extraclean: local-distclean x-local-extraclean
  	@if test -n "$(EXTRACLEAN_TARGETS)"; then \
  	    echo $(RM) -f $(EXTRACLEAN_TARGETS) ; \
  	    $(RM) -f $(EXTRACLEAN_TARGETS) ; \
  	fi
  
  local-all: $(TARGETS)
  
  local-depend: x-local-depend
  	@if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
  		$(RM) -f .deps; \
  		list='$(srcdir)/*.c'; \
  		for i in $$list; do \
  			$(MKDEP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) $$i | sed 's/\.o:/.lo:/' >> .deps; \
  		done; \
  	fi
  
  # to be filled in by the actual Makefile
  x-local-depend x-local-clean x-local-distclean x-local-extraclean:
  
  #
  # Implicit rules for creating outputs from input files
  #
  .SUFFIXES:
  .SUFFIXES: .c .lo .o
  
  .c.o:
  	$(COMPILE) -c $<
  
  .c.lo:
  	$(LT_COMPILE)
  
  .PHONY: all all-recursive local-all install \
  	depend depend-recursive local-depend x-local-depend \
  	clean clean-recursive local-clean x-local-clean \
  	distclean distclean-recursive local-distclean x-local-distclean \
  	extraclean extraclean-recursive local-extraclean x-local-extraclean
  
  
  

Mime
View raw message