This is the mail archive of the libc-hacker@sourceware.cygnus.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: make distclean in 2.1


On Fri, 8 May 1998 11:28:27 +0200 (CEST), Andreas Jaeger wrote:
>
>Hi,
>
>make distclean is working really well - except two problems.  The
>generated headers in iconvdata and the old*.o files in libio are not
>deleted.  Also some testscripts (wordexp and localedata) create
>temporary files which aren't deleted.

The libio/old*.o files are stale -- if you build from scratch you'll
see they don't get created.  So it doesn't bother deleting them either.

The appended patch should fix all the others.

zw

Fri May  8 16:36:08 1998  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* iconvdata/Makefile (generated): Set to *-generated-headers
	plus gconv-modules.
	(tests): Set to iconv-test.
	* localedata/Makefile (generated-dirs): Add ld-test-names to
	list.
	posix/Makefile (generated): Set to wordexp-test-result*.
	sunrpc/Makefile (generated): Remove rpcsvc/*.
	(generated-dirs): Add rpcsvc.
	* libio/Makefile: Clean up.

Index: iconvdata/Makefile
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/iconvdata/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- iconvdata/Makefile	1998/04/29 07:41:26	1.32
+++ iconvdata/Makefile	1998/05/08 20:35:25
@@ -270,6 +270,8 @@
 			  iso8859-7.h iso8859-8.h iso8859-10.h		 \
 			  iso8859-7jp.h
 
+generated = $(sed-generated-headers) $(perl-generated-headers) gconv-modules
+
 # The headers must be generated before the compilation.
 before-compile = $(addprefix $(objpfx),$(sed-generated-headers)) \
 		 $(addprefix $(objpfx),$(perl-generated-headers))
@@ -475,6 +477,7 @@
 
 include ../Rules
 
+tests = iconv-test
 tests: $(objpfx)iconv-test.out
 
 $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
Index: libio/Makefile
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/libio/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- libio/Makefile	1998/05/06 09:14:21	1.21
+++ libio/Makefile	1998/05/08 20:35:25
@@ -55,8 +55,7 @@
 CPPFLAGS += -D_IO_MTSAFE_IO
 endif
 
-aux	:=								      \
-	fileops genops stdfiles stdio strops
+aux	:= fileops genops stdfiles stdio strops
 
 ifeq ($(versioning),yes)
 aux	+= oldfileops oldstdfiles
Index: localedata/Makefile
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/localedata/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- localedata/Makefile	1998/04/30 16:55:19	1.15
+++ localedata/Makefile	1998/05/08 20:35:25
@@ -38,12 +38,12 @@
 test-input := de_DE.ISO-8859-1 da_DK.ISO-8859-1 fr_CA,2.13.ISO-8859-1
 test-output := $(foreach s, .out .xout, \
 			 $(addsuffix $s, $(basename $(test-input))))
-generated := $(test-input) $(test-output)
-generated-dirs := $(basename $(test-input)) en_US
-
 ld-test-names := test1 test2 test3 test4 test5
 ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
 				   $(addsuffix .def,$(ld-test-names)))
+
+generated := $(test-input) $(test-output)
+generated-dirs := $(basename $(test-input)) en_US $(ld-test-names)
 
 distribute := CHECKSUMS tst-fmon.sh tst-fmon.data ChangeLog sort-test.sh \
 	      README fr_CA,2.13.in de_DE.in da_DK.in $(repertoiremaps)	 \
Index: posix/Makefile
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/posix/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- posix/Makefile	1998/04/24 07:03:10	1.69
+++ posix/Makefile	1998/05/08 20:35:25
@@ -61,6 +61,9 @@
 
 before-compile	:= testcases.h
 
+# So they get cleaned up.
+generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10)
+
 include ../Rules
 
 ifeq (no,$(cross-compiling))
Index: sunrpc/Makefile
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/sunrpc/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- sunrpc/Makefile	1998/04/09 10:12:43	1.47
+++ sunrpc/Makefile	1998/05/08 20:35:25
@@ -54,9 +54,9 @@
 			   des_crypt.h key_prot.h rpc_des.h) \
 	  $(rpcsvc:%=rpcsvc/%)
 install-others = $(inst_sysconfdir)/rpc
-generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) \
-	    $(rpcsvc:%.x=rpcsvc/%.stmp) $(rpcsvc:%.x=x%.stmp) \
+generated = $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.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 Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]