make install-headers missing files

make install-headers missing files

[Andreas Schwab]

When doing make install-headers some headers are not installed.
gnu/stubs.h is still not installed since that depends on a full library
build, but for bootstrapping purpose an empty file will do.

Andreas.

2002-04-03  Andreas Schwab  <schwab@suse.de>

	* Makefile (headers): Add gnu/lib-names.h here instead of
	install-others.
	($(inst_includedir)/gnu/lib-names.h): Remove explicit
	installation rule.
	(install-headers): Add dependency on install-headers-nosubdir.
	* stdio-common/Makefile (headers): Add bits/stdio_lim.h here
	instead of install-others.
	($(inst_includedir)/bits/stdio_lim.h): Remove explicit
	installation rule.

Index: Makefile
===================================================================
RCS file: /cvs/glibc/libc/Makefile,v
retrieving revision 1.210.2.1
diff -u -a -r1.210.2.1 Makefile
--- Makefile	2002/01/08 21:43:50	1.210.2.1
+++ Makefile	2002/04/03 14:57:44
@@ -78,7 +78,7 @@
 install-bin-script = glibcbug
 
 ifeq (yes,$(build-shared))
-install-others += $(inst_includedir)/gnu/lib-names.h
+headers += gnu/lib-names.h
 endif
 
 include Makerules
@@ -90,6 +90,9 @@
 # Install from subdirectories too.
 install: subdir_install
 
+# Explicit dependency so that `make install-headers' works
+install-headers: install-headers-nosubdir
+
 # Make sure that the dynamic linker is installed before libc.
 $(inst_slibdir)/libc-$(version).so: elf/ldso_install
 
@@ -154,12 +157,6 @@
 	then echo 'stubs.h unchanged'; \
 	else $(INSTALL_DATA) $(objpfx)stubs.h $@; fi
 	rm -f $(objpfx)stubs.h
-\f
-ifeq (yes,$(build-shared))
-
-$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)gnu/lib-names.h $(+force)
-	$(do-install)
-endif
 \f
 # The `glibcbug' script contains the version number and it shall be rebuild
 # whenever this changes or the `glibcbug.in' file.
Index: stdio-common/Makefile
===================================================================
RCS file: /cvs/glibc/libc/stdio-common/Makefile,v
retrieving revision 1.67
diff -u -a -r1.67 stdio-common/Makefile
--- stdio-common/Makefile	2001/08/16 05:20:07	1.67
+++ stdio-common/Makefile	2002/04/03 15:00:28
@@ -21,7 +21,7 @@
 #
 subdir	:= stdio-common
 
-headers	:= printf.h stdio_ext.h
+headers	:= printf.h stdio_ext.h bits/stdio_lim.h
 
 routines	:=							      \
 	ctermid cuserid							      \
@@ -42,8 +42,6 @@
 routines += vfwprintf vfwscanf
 endif
 
-install-others := $(inst_includedir)/bits/stdio_lim.h
-
 aux	:= errlist siglist
 distribute := _itoa.h _itowa.h _i18n_number.h \
 	      printf-parse.h stdio_lim.h.in tst-unbputc.sh tst-printf.sh
@@ -84,9 +82,6 @@
 tst-sscanf-ENV = LOCPATH=$(common-objpfx)localedata
 tst-swprintf-ENV = LOCPATH=$(common-objpfx)localedata
 test-vfprintf-ENV = LOCPATH=$(common-objpfx)localedata
-
-$(inst_includedir)/bits/stdio_lim.h: $(common-objpfx)bits/stdio_lim.h
-	$(do-install)
 
 ifeq ($(stdio),libio)
 ifneq (,$(filter %REENTRANT, $(defines)))

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE GmbH, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: make install-headers missing files

[Ulrich Drepper]

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

On Wed, 2002-04-03 at 07:32, Andreas Schwab wrote:
> When doing make install-headers some headers are not installed.
> gnu/stubs.h is still not installed since that depends on a full library
> build, but for bootstrapping purpose an empty file will do.

What exactly are you trying to do?  What commands do you run?

-- 
---------------.                          ,-.   1325 Chesapeake Terrace
Ulrich Drepper  \    ,-------------------'   \  Sunnyvale, CA 94089 USA
Red Hat          `--' drepper at redhat.com   `------------------------

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 232 bytes --]

Re: make install-headers missing files

[Andreas Schwab]

Ulrich Drepper <drepper@redhat.com> writes:

|> On Wed, 2002-04-03 at 07:32, Andreas Schwab wrote:
|> > When doing make install-headers some headers are not installed.
|> > gnu/stubs.h is still not installed since that depends on a full library
|> > build, but for bootstrapping purpose an empty file will do.
|> 
|> What exactly are you trying to do?  What commands do you run?

As I wrote above: make install-headers.  This is supposed to install the
headers to do initial bootstrapping for an otherwise empty system.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE GmbH, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: make install-headers missing files

[Ulrich Drepper]

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

On Wed, 2002-04-03 at 07:32, Andreas Schwab wrote:
> When doing make install-headers some headers are not installed.
> gnu/stubs.h is still not installed since that depends on a full library
> build, but for bootstrapping purpose an empty file will do.

I cannot see anything obviously wrong with the patch and I assume you've
tested it.  If something break we know who to blame :-). Thanks,

-- 
---------------.                          ,-.   1325 Chesapeake Terrace
Ulrich Drepper  \    ,-------------------'   \  Sunnyvale, CA 94089 USA
Red Hat          `--' drepper at redhat.com   `------------------------

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 232 bytes --]