Fixes for make clean

Fixes for make clean

[Andreas Jaeger]

I needed the following fixes for make clean.  Ok to commit?

Now only these files in linuxthreads are not removed:
$ ll linuxthreads/
total 136861
-rw-r--r--    1 aj       suse        42096 May  5 11:38 libc-tsd.os
-rwxr-xr-x    1 aj       suse     18993840 May  5 11:38 libc.so
-rw-r--r--    1 aj       suse     61756576 May  5 11:38 libc_pic_lite.a
-rw-r--r--    1 aj       suse     59129130 May  5 11:38 libc_pic_lite.os
-rw-r--r--    1 aj       suse        74308 May  5 11:38 libpthread_nonshared.a

I don't see directly what's broken, there's a generated clause for
them,

Andreas

2003-05-05  Andreas Jaeger  <aj@suse.de>

	* sunrpc/Makefile (generated-dirs): New.

	* resolv/Makefile (generate): New.

============================================================
Index: sunrpc/Makefile
--- sunrpc/Makefile	16 Oct 2002 22:09:46 -0000	1.75
+++ sunrpc/Makefile	5 May 2003 09:18:06 -0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1994-2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1994-2001, 2002, 2003 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -55,6 +55,7 @@ headers = $(addprefix rpc/,auth.h auth_u
 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
+generated-dirs := rpcsvc
 
 routines := auth_none auth_unix authuxprot bindrsvprt \
 	    clnt_gen clnt_perr clnt_raw clnt_simp clnt_tcp \
============================================================
Index: resolv/Makefile
--- resolv/Makefile	1 Mar 2003 22:15:00 -0000	1.42
+++ resolv/Makefile	5 May 2003 09:18:06 -0000
@@ -34,6 +34,8 @@ routines := herror inet_addr inet_ntop i
 
 tests = tst-aton tst-leaks
 
+generate := mtrace-tst-leaks tst-leaks.mtrace
+
 include ../Makeconfig
 
 extra-libs := libresolv libnss_dns

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj

Re: Fixes for make clean

[Ulrich Drepper]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andreas Jaeger wrote:
> I needed the following fixes for make clean.  Ok to commit?

If it's needed, yes, I take your word for it.

- -- 
- --------------.                        ,-.            444 Castro Street
Ulrich Drepper \    ,-----------------'   \ Mountain View, CA 94041 USA
Red Hat         `--' drepper at redhat.com `---------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+tp1d2ijCOnn/RHQRAsreAJ9PsE0lKIoI16cwYIOxZQ/pndQPwQCeMFpW
IqxII7XGZNCR/CUe6Undk7A=
=ou95
-----END PGP SIGNATURE-----

Re: Fixes for make clean

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 1865 bytes --]

Jakub Jelinek <jakub@redhat.com> writes:

> On Mon, Jan 03, 2005 at 12:10:58PM +0100, Andreas Jaeger wrote:
>> 2005-01-03  Andreas Jaeger  <aj@suse.de>
>> 
>> 	* elf/Makefile (tests): Change rule for tst-pie1 so that make
>> 	clean works.
>> 
>> --- elf/Makefile	27 Oct 2004 20:26:47 -0000	1.287
>> +++ elf/Makefile	3 Jan 2005 11:10:36 -0000
>> @@ -1,4 +1,4 @@
>> -# Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc.
>> +# Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc.
>>  # This file is part of the GNU C Library.
>>  
>>  # The GNU C Library is free software; you can redistribute it and/or
>> @@ -163,7 +163,7 @@ tests-nodlopen-yes = nodlopen nodlopen2
>>  tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
>>  endif
>>  ifeq (yesyes,$(have-fpie)$(build-shared))
>> -tests: $(objpfx)tst-pie1.out
>> +tests += tst-pie1
>>  endif
>>  modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
>>  		testobj1_1 failobj constload2 constload3 unloadmod \
>
> This change is bad:
> make[2]: Entering directory
> `/usr/src/build/502950-i686/BUILD/glibc-20050106T2203/elf' Makefile:726: warning: overriding commands for target `/usr/src/build/502950-i686/BUILD/glibc-20050106T2203/build-i686-linux/elf/tst-pie1'
> ../Rules:118: warning: ignoring old commands for target `/usr/src/build/502950-i686/BUILD/glibc-20050106T2203/build-i686-linux/elf/tst-pie1'
> mkdir /usr/src/build/502950-i686/BUILD/glibc-20050106T2203/build-i686-linux/elf
>
> I think putting tst-pie1.out and tst-pie1 into generated instead would cure
> this.

I'll revert my patch now,

Andreas
-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: Fixes for make clean

[Jakub Jelinek]

On Mon, Jan 03, 2005 at 12:10:58PM +0100, Andreas Jaeger wrote:
> 2005-01-03  Andreas Jaeger  <aj@suse.de>
> 
> 	* elf/Makefile (tests): Change rule for tst-pie1 so that make
> 	clean works.
> 
> --- elf/Makefile	27 Oct 2004 20:26:47 -0000	1.287
> +++ elf/Makefile	3 Jan 2005 11:10:36 -0000
> @@ -1,4 +1,4 @@
> -# Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc.
> +# Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc.
>  # This file is part of the GNU C Library.
>  
>  # The GNU C Library is free software; you can redistribute it and/or
> @@ -163,7 +163,7 @@ tests-nodlopen-yes = nodlopen nodlopen2
>  tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
>  endif
>  ifeq (yesyes,$(have-fpie)$(build-shared))
> -tests: $(objpfx)tst-pie1.out
> +tests += tst-pie1
>  endif
>  modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
>  		testobj1_1 failobj constload2 constload3 unloadmod \

This change is bad:
make[2]: Entering directory
`/usr/src/build/502950-i686/BUILD/glibc-20050106T2203/elf' Makefile:726: warning: overriding commands for target `/usr/src/build/502950-i686/BUILD/glibc-20050106T2203/build-i686-linux/elf/tst-pie1'
../Rules:118: warning: ignoring old commands for target `/usr/src/build/502950-i686/BUILD/glibc-20050106T2203/build-i686-linux/elf/tst-pie1'
mkdir /usr/src/build/502950-i686/BUILD/glibc-20050106T2203/build-i686-linux/elf

I think putting tst-pie1.out and tst-pie1 into generated instead would cure
this.

	Jakub

Re: Fixes for make clean

[Ulrich Drepper]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

Andreas Jaeger wrote:

> Ok to commit?

Yes.

-- 
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]

Fixes for make clean

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 2516 bytes --]


After make clean I see the following files in my build-dir, the
appended patch takes care of deleting them:

./elf:
total 20
-rwxr-xr-x  1 aj users 12949 2005-01-02 10:38 tst-pie1
-rw-r--r--  1 aj users  3000 2004-09-29 21:21 tst-pie1.o
-rw-r--r--  1 aj users     0 2005-01-02 10:38 tst-pie1.out

./csu:
total 4
-rw-r--r--  1 aj users 2384 2005-01-02 09:31 start.os

Ok to commit?

Andreas

2005-01-03  Andreas Jaeger  <aj@suse.de>

	* csu/Makefile (generated): Add start.os and start.ob.

	* elf/Makefile (tests): Change rule for tst-pie1 so that make
	clean works.

============================================================
Index: csu/Makefile
--- csu/Makefile	20 Aug 2004 20:12:43 -0000	1.74
+++ csu/Makefile	3 Jan 2005 11:10:36 -0000
@@ -1,5 +1,5 @@
 # Makefile for csu code for GNU C library.
-# Copyright (C) 1995-2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -54,11 +54,13 @@ include ../Makeconfig
 ifeq (yes,$(build-shared))
 extra-objs += S$(start-installed-name)
 install-lib += S$(start-installed-name)
+generated += start.os
 endif
 
 ifeq (yes,$(build-bounded))
 extra-objs += b$(start-installed-name)
 install-lib += b$(start-installed-name)
+generated += start.ob
 endif
 
 ifneq ($(start-installed-name),$(static-start-installed-name))
============================================================
Index: elf/Makefile
--- elf/Makefile	27 Oct 2004 20:26:47 -0000	1.287
+++ elf/Makefile	3 Jan 2005 11:10:36 -0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -163,7 +163,7 @@ tests-nodlopen-yes = nodlopen nodlopen2
 tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
 endif
 ifeq (yesyes,$(have-fpie)$(build-shared))
-tests: $(objpfx)tst-pie1.out
+tests += tst-pie1
 endif
 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		testobj1_1 failobj constload2 constload3 unloadmod \

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: Fixes for make clean

[Roland McGrath]

Those look fine to me.

Fixes for make clean

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 2578 bytes --]


make clean left some extra files.  The appended patch fixes this.

Ok to commit?

Andreas

2003-12-31  Andreas Jaeger  <aj@suse.de>

	* resolv/Makefile (generated): New.

For linuxthreads:
2003-12-31  Andreas Jaeger  <aj@suse.de>

	* Makefile (generated): Add missing files.


============================================================
Index: linuxthreads/Makefile
--- linuxthreads/Makefile	17 Dec 2003 23:47:29 -0000	1.85
+++ linuxthreads/Makefile	31 Dec 2003 11:25:12 -0000
@@ -131,6 +131,7 @@ modules-names = tst-_res1mod1 tst-_res1m
 		tst-tls1mod tst-tls1moda tst-tls1modb tst-tls1modc \
 		tst-tls1modd tst-tls1mode tst-tls1modf
 extra-objs += $(addsuffix .os,$(strip $(modules-names)))
+generated += $(addsuffix .so,$(strip $(modules-names)))
 test-extras += $(modules-names)
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
 
@@ -236,7 +237,7 @@ $(objpfx)libc.so: $(elfobjdir)/soinit.os
 		  $(elfobjdir)/interp.os $(elfobjdir)/ld.so
 	$(build-shlib)
 
-generated += libc_pic_lite.a libc_pic_lite.os libc.so
+generated += libc_pic_lite.a libc_pic_lite.os libc.so libc-tsd.os
 else
 libc-link.so = $(common-objpfx)libc.so
 endif
@@ -317,7 +318,7 @@ $(objpfx)$(multidir)/crtn.o: $(objpfx)cr
 	ln -f $< $@
 endif
 
-generated += crti.S crtn.S defs.h pt-initfini.s
+generated += crti.S crtn.S defs.h pt-initfini.s libpthread_nonshared.a 
 endif
 
 ifeq (yes,$(build-static-nss))
@@ -338,6 +339,7 @@ $(objpfx)tst-tls2.out: tst-tls2.sh $(obj
 		       $(objpfx)tst-tls1mode.so $(objpfx)tst-tls1modf.so
 	$(SHELL) -e tst-tls2.sh $(common-objpfx) $(elf-objpfx) \
 		    $(rtld-installed-name)
+generated += tst-tls2.out
 endif
 
 ifeq (no,$(cross-compiling))
@@ -350,5 +352,6 @@ $(objpfx)tst-cancel-wrappers.out: tst-ca
 		    $(common-objpfx)/libc.a \
 		    $(objpfx)/libpthread_pic.a \
 		    $(objpfx)/libpthread.a > $@
+generated += tst-signal.out tst-cancel-wrappers.out
 endif
 endif
============================================================
Index: resolv/Makefile
--- resolv/Makefile	30 Aug 2003 18:47:37 -0000	1.44
+++ resolv/Makefile	31 Dec 2003 11:25:12 -0000
@@ -65,6 +65,8 @@ ifeq (yesyes,$(build-shared)$(have-threa
 tests: $(objpfx)ga_test
 endif
 
+generated := mtrace-tst-leaks tst-leaks.mtrace
+
 include ../Rules
 
 CPPFLAGS += -Dgethostbyname=res_gethostbyname \

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SuSE Linux AG, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]