apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: apr configure.in Makefile.in
Date Thu, 11 Jan 2001 09:09:43 GMT
gstein      01/01/11 01:09:43

  Modified:    .        configure.in Makefile.in
  Log:
  - get libapr.la relinking when something has changed
  - toss MODULES from the Makefile; it wasn't doing anything useful (SUBDIRS
    is the key)
  
  Revision  Changes    Path
  1.209     +0 -1      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.208
  retrieving revision 1.209
  diff -u -u -r1.208 -r1.209
  --- configure.in	2001/01/10 01:01:33	1.208
  +++ configure.in	2001/01/11 09:09:42	1.209
  @@ -880,7 +880,6 @@
   
   MAKEFILE3="test/Makefile"
   AC_SUBST(SUBDIRS)
  -AC_SUBST(MODULES)
   
   if test -n "$CPPFLAGS"; then
     CFLAGS="$CFLAGS $CPPFLAGS"
  
  
  
  1.39      +14 -7     apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -u -r1.38 -r1.39
  --- Makefile.in	2001/01/10 01:01:33	1.38
  +++ Makefile.in	2001/01/11 09:09:43	1.39
  @@ -12,19 +12,16 @@
   #
   # Macros for target determination
   #
  -MODULES=@MODULES@
   SUBDIRS=@SUBDIRS@
  -#shmem/@OSDIR@
   
  -LIBAPR = libapr.la
  -
  +TARGET_LIB = libapr.la
   TARGET_EXPORTS = apr.exports
   
   #
   # Rules for building specific targets, starting with 'all' for
   # building the entire package.
   #
  -TARGETS = $(LIBAPR) delete-exports $(TARGET_EXPORTS)
  +TARGETS = delete-lib $(TARGET_LIB) delete-exports $(TARGET_EXPORTS)
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  @@ -38,8 +35,18 @@
   
   ### fix this up at some point (install location)
   libdir = /usr/local/lib
  +
  +delete-lib:
  +	@if test -f $(TARGET_LIB); then \
  +	    for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
  +	    if test -n "`find $$objects -newer $(TARGET_LIB)`"; then \
  +		echo Found newer objects. Will relink $(TARGET_LIB). ; \
  +		echo $(RM) -f $(TARGET_LIB) ; \
  +		$(RM) -f $(TARGET_LIB) ; \
  +	    fi \
  +	fi
   
  -$(LIBAPR): $(MODULES)
  +$(TARGET_LIB):
   	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
   	    echo $(LINK) -rpath $(libdir) $$objects ; \
   	    $(LINK) -rpath $(libdir) $$objects
  @@ -68,7 +75,7 @@
   		$(srcdir)helpers/scandoc -i$(srcdir)helpers/default.pl -p./docs/ $(srcdir)include/*.h;
\
   	fi
   
  -test: $(LIBAPR)
  +test: $(TARGET_LIB)
   	(cd test; make clean; make; \
   	cd test; \
   	for prog in `find . -type f -perm +u+x -name "test*" -print`; do \
  
  
  

Mime
View raw message