Return-Path: <jfclere@apache.org>
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 47431 invoked by uid 500); 6 Oct 2004 16:57:02 -0000
Delivered-To: apmail-apr-iconv-cvs@apache.org
Received: (qmail 47402 invoked by uid 99); 6 Oct 2004 16:57:01 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 06 Oct 2004 09:57:01 -0700
Received: (qmail 69748 invoked by uid 1303); 6 Oct 2004 16:57:00 -0000
Date: 6 Oct 2004 16:57:00 -0000
Message-ID: <20041006165700.69747.qmail@minotaur.apache.org>
From: jfclere@apache.org
To: apr-iconv-cvs@apache.org
Subject: cvs commit: apr-iconv/lib Makefile.in
X-Virus-Checked: Checked

jfclere     2004/10/06 09:56:59

  Modified:    lib      Makefile.in
  Log:
  Arrange the logic.
  Note that build-outputs.mk is still missing.
  
  Revision  Changes    Path
  1.6       +17 -9     apr-iconv/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-iconv/lib/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	22 Jun 2004 12:59:17 -0000	1.5
  +++ Makefile.in	6 Oct 2004 16:56:59 -0000	1.6
  @@ -18,20 +18,28 @@
   CLEAN_TARGETS = exports.c
   
   # May need to do something for apriconv.exports
  -TARGETS = iconv_module.lo iconv.lo iconv_int.lo iconv_uc.lo \
  -	iconv_ces.lo iconv_ces_euc.lo iconv_ces_iso2022.lo api_version.lo \
  -	exports.lo $(TARGET_LIB)
  +TARGETS = $(TARGET_LIB)
   
  -#OBJECTS=
  +OBJECTS_all = iconv_module.lo iconv.lo iconv_int.lo iconv_uc.lo \
  +        iconv_ces.lo iconv_ces_euc.lo iconv_ces_iso2022.lo api_version.lo \
  +        iconv_ccs.lo exports.lo
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  +# replace build-outputs.mk
  +OBJECTS_unix = $(OBJECTS_all)
  + 
  +OBJECTS_aix = $(OBJECTS_all)
  + 
  +OBJECTS_beos = $(OBJECTS_all)
  + 
  +OBJECTS_os2 = $(OBJECTS_all)
  + 
  +OBJECTS_os390 = $(OBJECTS_all)
  +# end replace
   
  -$(TARGET_LIB):
  -	@objects="`find $(SUBDIRS) -name '*.@APR_SO_EXT@' -print`"; \
  -	tmpcmd="$(LINK) @APR_LIB_TARGET@ $$objects"; \
  -	echo $$tmpcmd; \
  -	$$tmpcmd && touch $@
  +$(TARGET_LIB): $(OBJECTS)
  +	$(LINK) @APR_LIB_TARGET@
   
   exports.c:
   	$(AWK) -f $(abs_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@