about summary refs log tree commit diff
path: root/iconvdata/Makefile
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-03-01 07:15:16 +0000
committerUlrich Drepper <drepper@redhat.com>1999-03-01 07:15:16 +0000
commit407a7d0eb770ae079a662e7b2b8cff5a750ca6ed (patch)
tree54379335a4475b55620c7fa3a2448afef056c8f5 /iconvdata/Makefile
parentb7e2d9a56b3f16b231c2370b589b11d3a322337b (diff)
downloadglibc-407a7d0eb770ae079a662e7b2b8cff5a750ca6ed.tar.gz
glibc-407a7d0eb770ae079a662e7b2b8cff5a750ca6ed.tar.xz
glibc-407a7d0eb770ae079a662e7b2b8cff5a750ca6ed.zip
Update.
1999-02-25  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* manual/libc.texinfo: Wrap @top node inside @ifnottex instead of
	@ifinfo.

1999-02-25  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* iconvdata/Makefile: Always include iconv-rules, but disable rule
	to regenerate it if avoid-generated.

	* Makeconfig: Always include sys-dirs, but disable rule to
	regenerate it when avoid-generated.

	* sysdeps/unix/Makefile: Put `ifndef avoid-generated' only around
	rule to generate sysd-syscalls.

	* elf/Makefile (generated): Remove $(objpfx) from names.
Diffstat (limited to 'iconvdata/Makefile')
-rw-r--r--iconvdata/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index bc024d1861..cab662b159 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -118,9 +118,7 @@ ifeq (yes,$(build-shared))
 
 # Rule to generate the shared objects.
 charmaps = ../localedata/charmaps
-ifndef no_deps
 -include $(objpfx)iconv-rules
-endif
 extra-modules-left := $(modules)
 include extra-module.mk
 
@@ -186,6 +184,7 @@ endef
 # The headers must be generated before the compilation.
 before-compile = $(addprefix $(objpfx),$(generated-modules:=.h))
 
+ifndef avoid-generated
 $(objpfx)iconv-rules: Makefile
 	$(make-target-directory)
 	{ echo $(filter-out lib%, $(modules)); \
@@ -207,6 +206,7 @@ $(objpfx)iconv-rules: Makefile
 		  } \
 		}' > $@.new
 	mv -f $@.new $@
+endif
 
 $(generated-modules:%=$(objpfx)%.h): $(objpfx)%.h: $(objpfx)%.stmp
 	@: