Patches for make clean

[Andreas Jaeger]

We should properly clean up.  I've tested this with static and shared
builds.

Ok, to commit?

Andreas

2000-07-01  Andreas Jaeger  <aj@suse.de>

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

	* elf/Makefile (generated): trusted-dirs.h is always generated,
	move out of build-shared condition.
	(generated): Merge the two entries for build-shared.

For localedata/ChangeLog:
2000-07-01  Andreas Jaeger  <aj@suse.de>

	* Makefile (generated-dirs): LOCALES are also generated.
	(generated-dirs): Remove obsolete entry.

============================================================
Index: intl/Makefile
--- intl/Makefile	2000/05/24 09:31:17	1.24
+++ intl/Makefile	2000/07/01 12:36:24
@@ -34,6 +34,7 @@
 install-others = $(inst_msgcatdir)/locale.alias
 
 generated = msgs.h
+generated-dirs := domaindir
 
 plural.c: plural.y
 	$(YACC) $(YFLAGS) $@ $^
@@ -91,4 +92,3 @@
 endif
 
 endif
-
============================================================
Index: elf/Makefile
--- elf/Makefile	2000/06/30 18:10:42	1.155
+++ elf/Makefile	2000/07/01 12:36:25
@@ -49,7 +49,8 @@
 
 include ../Makeconfig
 
-before-compile = $(objpfx)trusted-dirs.h
+before-compile  = $(objpfx)trusted-dirs.h
+generated	:= trusted-dirs.h trusted-dirs.st
 
 ifeq ($(versioning),yes)
 ld-map		= $(common-objpfx)ld.map
@@ -57,10 +58,9 @@
 
 ifeq (yes,$(build-shared))
 extra-objs	= $(rtld-routines:=.os) soinit.os sofini.os interp.os
-generated	= librtld.os dl-allobjs.os ld.so trusted-dirs.h trusted-dirs.st
+generated	+= librtld.os dl-allobjs.os ld.so ldd
 install-others	= $(inst_slibdir)/$(rtld-installed-name)
 install-bin	= ldd
-generated      += ldd
 endif
 
 others		= sprof sln
============================================================
Index: localedata/Makefile
--- localedata/Makefile	2000/07/01 06:31:04	1.64
+++ localedata/Makefile	2000/07/01 12:36:25
@@ -60,9 +60,8 @@
 	     y01y10 y02n22 y22n42 y30y21 y32n31 y40y00 y42n21
 
 generated := $(test-input) $(test-output)
-generated-dirs := $(basename $(test-input)) $(ld-test-names) tt_TT	\
-		  de_DE.437 $(addprefix tstfmon_,$(fmon-tests))		\
-		  en_US.ANSI_X3.4-1968 ja_JP.EUC-JP
+generated-dirs := $(ld-test-names) tt_TT de_DE.437			\
+		  $(addprefix tstfmon_,$(fmon-tests))			\
 
 distribute := CHECKSUMS README SUPPORTED ChangeLog			\
 	      $(charmaps) $(locales) $(repertoiremaps)			\
@@ -125,6 +124,8 @@
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)"|sed 's/[^ .]*[.]\([^ ]*\)/\1/g')
 CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES))
+
+generated-dirs += $(LOCALES)
 
 # Dependency for the locale files.  We actually make it depend only on
 # one of the files.


-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de