You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2003/04/23 14:25:48 UTC

cvs commit: apr-util/test Makefile.in

trawick     2003/04/23 05:25:48

  Modified:    test     Makefile.in
  Log:
  on OS/390, any -L/path/to/libraries on the link invocation
  needs to come before the list of objects
  
  Revision  Changes    Path
  1.36      +13 -12    apr-util/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/test/Makefile.in,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Makefile.in	29 Dec 2002 19:21:49 -0000	1.35
  +++ Makefile.in	23 Apr 2003 12:25:48 -0000	1.36
  @@ -12,7 +12,8 @@
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  -PROGRAM_DEPENDENCIES = @APRUTIL_LDFLAGS@ @APRUTIL_LIBS@
  +PROGRAM_DEPENDENCIES = @APRUTIL_LIBS@
  +APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
   
   all: $(PROGRAMS)
   
  @@ -28,55 +29,55 @@
   testdbm_OBJECTS = testdbm.lo
   testdbm_LDADD =  $(TARGET_LIB_PATH)
   testdbm: $(testdbm_OBJECTS) $(testdbm_LDADD)
  -	$(LINK) $(testdbm_OBJECTS) $(testdbm_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testdbm_OBJECTS) $(testdbm_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testdate_OBJECTS = testdate.lo
   testdate_LDADD =  $(TARGET_LIB_PATH)
   testdate: $(testdate_OBJECTS) $(testdate_LDADD)
  -	$(LINK) $(testdate_OBJECTS) $(testdate_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testdate_OBJECTS) $(testdate_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testxml_OBJECTS = testxml.lo
   testxml_LDADD =  $(TARGET_LIB_PATH)
   testxml: $(testxml_OBJECTS) $(testxml_LDADD)
  -	$(LINK) $(testxml_OBJECTS) $(testxml_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testxml_OBJECTS) $(testxml_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testmd4_OBJECTS = testmd4.lo
   testmd4_LDADD =  $(TARGET_LIB_PATH)
   testmd4: $(testmd4_OBJECTS) $(testmd4_LDADD)
  -	$(LINK) $(testmd4_OBJECTS) $(testmd4_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testmd4_OBJECTS) $(testmd4_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testmd5_OBJECTS = testmd5.lo
   testmd5_LDADD =  $(TARGET_LIB_PATH)
   testmd5: $(testmd5_OBJECTS) $(testmd5_LDADD)
  -	$(LINK) $(testmd5_OBJECTS) $(testmd5_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testmd5_OBJECTS) $(testmd5_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testrmm_OBJECTS = testrmm.lo
   testrmm_LDADD =  $(TARGET_LIB_PATH)
   testrmm: $(testrmm_OBJECTS) $(testrmm_LDADD)
  -	$(LINK) $(testrmm_OBJECTS) $(testrmm_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testrmm_OBJECTS) $(testrmm_LDADD) $(PROGRAM_DEPENDENCIES)
   
   teststrmatch_OBJECTS = teststrmatch.lo
   teststrmatch_LDADD =  $(TARGET_LIB_PATH)
   teststrmatch: $(teststrmatch_OBJECTS) $(teststrmatch_LDADD)
  -	$(LINK) $(teststrmatch_OBJECTS) $(teststrmatch_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(teststrmatch_OBJECTS) $(teststrmatch_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testuuid_OBJECTS = testuuid.lo
   testuuid_LDADD =  $(TARGET_LIB_PATH)
   testuuid: $(testuuid_OBJECTS) $(testuuid_LDADD)
  -	$(LINK) $(testuuid_OBJECTS) $(testuuid_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testuuid_OBJECTS) $(testuuid_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testreslist_OBJECTS = testreslist.lo
   testreslist_LDADD =  $(TARGET_LIB_PATH)
   testreslist: $(testreslist_OBJECTS) $(testreslist_LDADD)
  -	$(LINK) $(testreslist_OBJECTS) $(testreslist_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testreslist_OBJECTS) $(testreslist_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testqueue_OBJECTS = testqueue.lo
   testqueue_LDADD =  $(TARGET_LIB_PATH)
   testqueue: $(testqueue_OBJECTS) $(testqueue_LDADD)
  -	$(LINK) $(testqueue_OBJECTS) $(testqueue_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testqueue_OBJECTS) $(testqueue_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testuri_OBJECTS = testuri.lo
   testuri_LDADD =  $(TARGET_LIB_PATH)
   testuri: $(testuri_OBJECTS) $(testuri_LDADD)
  -	$(LINK) $(testuri_OBJECTS) $(testuri_LDADD) $(PROGRAM_DEPENDENCIES)
  +	$(LINK) $(APRUTIL_LDFLAGS) $(testuri_OBJECTS) $(testuri_LDADD) $(PROGRAM_DEPENDENCIES)