apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: apr/helpers rules.mk.in
Date Fri, 16 Feb 2001 10:17:12 GMT
fielding    01/02/16 02:17:12

  Modified:    .        Makefile.in configure.in
               helpers  rules.mk.in
  Log:
  Use symbols to reduce hard-coded pathnames.
  
  Revision  Changes    Path
  1.40      +2 -10     apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- Makefile.in	2001/01/11 09:09:43	1.39
  +++ Makefile.in	2001/02/16 10:17:10	1.40
  @@ -62,18 +62,10 @@
   	fi
   
   $(TARGET_EXPORTS):
  -	if test -z "$(srcdir)"; then \
  -		$(AWK) -f helpers/make_export.awk include/*.h > $@ ; \
  -	else \
  -		$(AWK) -f $(srcdir)helpers/make_export.awk $(srcdir)include/*.h > $@ ; \
  -	fi
  +	$(MKEXPORT) include/*.h > $@
   
   docs:
  -	if test -z "$(srcdir)"; then \
  -		helpers/scandoc -ihelpers/default.pl -p./docs/ ./include/*.h; \
  -	else \
  -		$(srcdir)helpers/scandoc -i$(srcdir)helpers/default.pl -p./docs/ $(srcdir)include/*.h;
\
  -	fi
  +	$(SCANDOC) -ihelpers/default.pl -p./docs/ ./include/*.h
   
   test: $(TARGET_LIB)
   	(cd test; make clean; make; \
  
  
  
  1.226     +9 -6      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.225
  retrieving revision 1.226
  diff -u -r1.225 -r1.226
  --- configure.in	2001/02/13 18:48:47	1.225
  +++ configure.in	2001/02/16 10:17:10	1.226
  @@ -26,12 +26,6 @@
   top_builddir="$abs_builddir"
   AC_SUBST(top_builddir)
   
  -dnl Get location of helpers directory
  -dnl XXX This assumes that APR "lives" under Apache.
  -dnl XXX We'll need to fix this when we pull it out.
  -abs_helpersdir=$abs_srcdir/helpers
  -MKDIR=$abs_helpersdir/mkdir.sh
  -
   if test "$abs_builddir" != "$abs_srcdir"; then
     USE_VPATH=1
   fi
  @@ -47,6 +41,15 @@
   AC_PROG_AWK
   AC_CHECK_PROG(RM, rm, rm)
   AC_CHECK_TOOL(AR, ar, ar)
  +
  +dnl Get locations of the build helper scripts
  +MKDIR=$abs_srcdir/helpers/mkdir.sh
  +APR_MKEXPORT="$AWK -f $abs_srcdir/helpers/make_export.awk"
  +AC_SUBST(APR_MKEXPORT)
  +APR_MKDEP=$abs_srcdir/helpers/mkdep.sh
  +AC_SUBST(APR_MKDEP)
  +APR_SCANDOC=$abs_srcdir/helpers/scandoc
  +AC_SUBST(APR_SCANDOC)
   
   # This macro needs to be here in case we are on an AIX box.
   AC_AIX
  
  
  
  1.6       +4 -2      apr/helpers/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/helpers/rules.mk.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- rules.mk.in	2001/02/16 04:15:40	1.5
  +++ rules.mk.in	2001/02/16 10:17:11	1.6
  @@ -75,10 +75,12 @@
   RM=@RM@
   SHELL=@SHELL@
   
  +MKEXPORT=@APR_MKEXPORT@
  +MKDEP=@APR_MKDEP@
  +SCANDOC=@APR_SCANDOC@
  +
   ### make LTFLAGS somewhat variable?
   LTFLAGS = --silent
  -
  -MKDEP=$(top_builddir)/helpers/mkdep.sh
   
   #
   # Basic macro setup
  
  
  

Mime
View raw message