From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16579 invoked by alias); 9 Jun 2003 19:20:11 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 16458 invoked from network); 9 Jun 2003 19:20:09 -0000 Received: from unknown (HELO mout1.freenet.de) (194.97.50.132) by sources.redhat.com with SMTP; 9 Jun 2003 19:20:09 -0000 Received: from [194.97.50.135] (helo=mx2.freenet.de) by mout1.freenet.de with asmtp (Exim 4.20) id 19PSBc-0004SK-O0 for libc-hacker@sources.redhat.com; Mon, 09 Jun 2003 21:20:08 +0200 Received: from b0292.pppool.de ([213.7.2.146] helo=whitebox.local) by mx2.freenet.de with esmtp (Exim 4.20 #1) id 19PSBb-0001TT-Fc for libc-hacker@sources.redhat.com; Mon, 09 Jun 2003 21:20:08 +0200 Received: from whitebox.local (localhost [127.0.0.1]) by whitebox.local (8.12.7/8.12.7/SuSE Linux 0.6) with ESMTP id h59Ek8Pd001893 for ; Mon, 9 Jun 2003 16:46:08 +0200 Received: (from andreas@localhost) by whitebox.local (8.12.7/8.12.7/Submit) id h59Ek7vI001890; Mon, 9 Jun 2003 16:46:07 +0200 X-Authentication-Warning: whitebox.local: andreas set sender to schwab@suse.de using -f To: libc-hacker@sources.redhat.com Subject: Depfiles fix for sunrpc X-Yow: LOU GRANT froze my ASSETS!! From: Andreas Schwab Date: Mon, 09 Jun 2003 19:20:00 -0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2003-06/txt/msg00009.txt.bz2 This makes sunrpc/Makefile use the *.dt files for the librpcsvc objects, which are already generated anyway. Andreas. 2003-06-09 Andreas Schwab * sunrpc/Makefile (generated): Remove rpc-proto.c, rpc-proto.d. ($(rpcsvc:%.x=$(objpfx)x%$o)): Don't depend on $(objpfx)rpc-proto.d. (rpcsvc-dt-files, rpcsvc-depfiles): Define. Include $(rpcsvc-depfiles) instead of $(objpfx)rpc-proto.d. ($(objpfx)rpc-proto.d, $(objpfx)rpc-proto.c): Remove rules. --- sunrpc/Makefile.~1.76.~ 2003-05-05 22:25:21.000000000 +0200 +++ sunrpc/Makefile 2003-06-09 16:40:15.000000000 +0200 @@ -54,7 +54,7 @@ headers = $(addprefix rpc/,auth.h auth_u $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h install-others = $(inst_sysconfdir)/rpc generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpc-proto.c rpc-proto.d rpcgen + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen generated-dirs := rpcsvc routines := auth_none auth_unix authuxprot bindrsvprt \ @@ -168,26 +168,20 @@ $(objpfx)x%.stmp: rpcsvc/%.x $(objpfx)rp # Gratuitous dependency on generated .c file here just gets it mentioned to # avoid being an intermediate file and getting removed. define o-iterator-doit -$(rpcsvc:%.x=$(objpfx)x%$o): $(objpfx)x%$o: $(objpfx)x%.c $(objpfx)rpcsvc/%.h \ - $(objpfx)rpc-proto.d +$(rpcsvc:%.x=$(objpfx)x%$o): $(objpfx)x%$o: $(objpfx)x%.c $(objpfx)rpcsvc/%.h endef object-suffixes-left = $(filter-out $(librpcsvc-inhibit-o),$(object-suffixes)) include $(o-iterator) -ifndef no_deps --include $(objpfx)rpc-proto.d +rpcsvc-dt-files := $(foreach o,$(filter-out $(librpcsvc-inhibit-o),\ + $(object-suffixes)),\ + $(rpcsvc:%.x=$(objpfx)x%$o.dt)) +rpcsvc-depfiles := $(patsubst %.dt,%.d,$(wildcard $(rpcsvc-dt-files))) \ + $(wildcard $(rpcsvc-dt-files:.dt=.d)) +ifdef rpcsvc-depfiles +ifneq ($(no_deps),t) +-include $(rpcsvc-depfiles) +endif endif - -$(objpfx)rpc-proto.d: $(objpfx)%.d: $(objpfx)%.c - $(+make-deps) -# Special file to generate dependencies for the RPC service objects. -# Collect all include directives from the source files. -$(objpfx)rpc-proto.c: $(rpcsvc:%=rpcsvc/%) - $(make-target-directory) - { echo '#include '; \ - echo '#include '; \ - echo '#include '; \ - sed -n '/^%#include/s/%//p' $^; } > $@T - mv -f $@T $@ $(objpfx)thrsvc: $(shared-thread-library)