diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | iconvdata/Makefile | 4 | ||||
| -rw-r--r-- | manual/libc.texinfo | 4 | ||||
| -rw-r--r-- | sysdeps/unix/Makefile | 4 |
5 files changed, 25 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index da5a941201..7da090e005 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +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. + 1999-02-28 Mark Kettenis <kettenis@gnu.org> * sysdeps/mach/hurd/getsockname.c (getsockname): Set *LEN to the diff --git a/elf/Makefile b/elf/Makefile index 1e8d1a40fc..5236165e2a 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -210,7 +210,7 @@ $(objpfx)ldd: ldd.bash.in $(common-objpfx)soversions.mk \ $(objpfx)sprof: $(libdl) test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) -generated += $(test-modules) +generated += $(addsuffix .so,$(modules-names)) $(objpfx)testobj1.so: $(libdl) $(objpfx)testobj1_1.so: $(objpfx)testobj1.so $(libdl) 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 @: diff --git a/manual/libc.texinfo b/manual/libc.texinfo index ee5ee051fe..21a864c1a6 100644 --- a/manual/libc.texinfo +++ b/manual/libc.texinfo @@ -101,13 +101,13 @@ Foundation. @end titlepage @page -@ifinfo +@ifnottex @node Top, Introduction, (dir), (dir) @top Main Menu This is Edition @value{EDITION}, last updated @value{UPDATED}, of @cite{The GNU C Library Reference Manual}, for Version @value{VERSION} of the GNU C Library. -@end ifinfo +@end ifnottex @include top-menu.texi @include chapters.texi diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile index 9727844897..ffa207db52 100644 --- a/sysdeps/unix/Makefile +++ b/sysdeps/unix/Makefile @@ -270,7 +270,6 @@ endif endif -ifndef avoid-generated ifndef inhibit-unix-syscalls # Sysdep dirs unix/... can contain a file syscalls.list, @@ -286,6 +285,7 @@ endif export sysdirs export asm_CPP := $(COMPILE.S) -E -x assembler-with-cpp +ifndef avoid-generated $(common-objpfx)sysd-syscalls: $(..)sysdeps/unix/make-syscalls.sh \ $(wildcard $(+sysdep_dirs:%=%/syscalls.list)) for dir in $(+sysdep_dirs); do \ @@ -294,6 +294,7 @@ $(common-objpfx)sysd-syscalls: $(..)sysdeps/unix/make-syscalls.sh \ test $$dir = $(..)sysdeps/unix && break; \ done > $@T mv -f $@T $@ +endif # This syscall objects depend on s-proto.d, which is generated to # specify dependencies generated syscalls with have on headers. @@ -314,4 +315,3 @@ common-generated += s-proto.d postclean-generated += sysd-syscalls endif -endif |