apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: apr-util/test Makefile.in
Date Fri, 24 Aug 2001 03:18:54 GMT
ianh        01/08/23 20:18:54

  Modified:    .        configure.in
               test     Makefile.in
  Log:
  Fix configure.in to add the contents of APRUTIL_EXPORT_LIBS to LIBS.
  Fix Makefile.in to set LIBS (and remove the += and the ALL_LIBS)
  there is still something a bit funky with apr-utils's configure.in
  as it is not setting LIBS up in the rules.mk.
  
  Revision  Changes    Path
  1.33      +1 -0      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- configure.in	2001/08/18 09:54:16	1.32
  +++ configure.in	2001/08/24 03:18:54	1.33
  @@ -84,6 +84,7 @@
   
   AC_SUBST(APRUTIL_EXPORT_LIBS)
   AC_SUBST(LDFLAGS)
  +APR_ADDTO(LIBS,[$APRUTIL_EXPORT_LIBS])
   
   dnl
   dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
  
  
  
  1.16      +5 -5      apr-util/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/test/Makefile.in,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile.in	2001/08/22 22:25:47	1.15
  +++ Makefile.in	2001/08/24 03:18:54	1.16
  @@ -5,26 +5,26 @@
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  -ALL_LIBS += @APRUTIL_EXPORT_LIBS@
  +LIBS = @LIBS@
   
   test: $(PROGRAMS)
   
   testdbm_OBJECTS = testdbm.lo
   testdbm_LDADD =  ../libaprutil.la @APR_SOURCE_DIR@/libapr.la 
   testdbm: $(testdbm_OBJECTS) $(testdbm_LDADD)
  -	$(LINK) $(testdbm_OBJECTS) $(testdbm_LDADD) $(ALL_LIBS)
  +	$(LINK) $(testdbm_OBJECTS) $(testdbm_LDADD) $(LIBS)
   
   testdate_OBJECTS = testdate.lo
   testdate_LDADD =  ../libaprutil.la @APR_SOURCE_DIR@/libapr.la 
   testdate: $(testdate_OBJECTS) $(testdate_LDADD)
  -	$(LINK) $(testdate_OBJECTS) $(testdate_LDADD) $(ALL_LIBS)
  +	$(LINK) $(testdate_OBJECTS) $(testdate_LDADD) $(LIBS)
   
   testxml_OBJECTS = testxml.lo
   testxml_LDADD =  ../libaprutil.la @APR_SOURCE_DIR@/libapr.la 
   testxml: $(testxml_OBJECTS) $(testxml_LDADD)
  -	$(LINK) $(testxml_OBJECTS) $(testxml_LDADD) $(ALL_LIBS)
  +	$(LINK) $(testxml_OBJECTS) $(testxml_LDADD) $(LIBS)
   
   testmd4_OBJECTS = testmd4.lo
   testmd4_LDADD =  ../libaprutil.la @APR_SOURCE_DIR@/libapr.la 
   testmd4: $(testmd4_OBJECTS) $(testmd4_LDADD)
  -	$(LINK) $(testmd4_OBJECTS) $(testmd4_LDADD) $(ALL_LIBS)
  +	$(LINK) $(testmd4_OBJECTS) $(testmd4_LDADD) $(LIBS)
  
  
  

Mime
View raw message