projects
/
platform
/
upstream
/
glibc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Makefile ($(includedir)/stubs.h): Add missing backslash.
[platform/upstream/glibc.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e21b8af
..
8ff7284
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,4
+1,4
@@
-# Copyright (C) 1991,
1992, 1993, 1994, 1995
Free Software Foundation, Inc.
+# Copyright (C) 1991,
92, 93, 94, 95, 96
Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@
-29,18
+29,20
@@
endif
all: lib others
\f
define autoconf-it
all: lib others
\f
define autoconf-it
+@-rm -f $@.new
autoconf $(ACFLAGS) $< > $@.new
autoconf $(ACFLAGS) $< > $@.new
+chmod a-w,a+x $@.new
mv -f $@.new $@
mv -f $@.new $@
-test
-d CVS &&
cvs commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
+test
! -d CVS ||
cvs commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
endef
endef
-configure: configure.in; $(autoconf-it)
-%/configure: %/configure.in; $(autoconf-it)
+configure: configure.in
aclocal.m4
; $(autoconf-it)
+%/configure: %/configure.in
aclocal.m4
; $(autoconf-it)
include Makeconfig
ifndef avoid-generated
include Makeconfig
ifndef avoid-generated
-include $(objpfx)sysd-dirs
+
-
include $(objpfx)sysd-dirs
define \n
define \n
@@
-49,14
+51,14
@@
sysdep-subdirs := $(subst $(\n), ,$(sysdep-subdirs))
endif
# These are the subdirectories containing the library source.
endif
# These are the subdirectories containing the library source.
-subdirs
:= csu assert ctype locale math setjmp signal stdio stdlib
\
-
malloc string time dirent grp pwd posix io termios resource
\
-
socket misc gnulib $(wildcard crypt) manual
\
- $(sysdep-subdirs) elf
+subdirs
= csu assert ctype db locale intl catgets math setjmp signal stdlib
\
+
stdio-common $(stdio) malloc string wcsmbs time dirent grp pwd
\
+
posix io termios resource misc login socket sysvipc gmon gnulib
\
+ wctype $(wildcard crypt) manual $(sysdep-subdirs) elf po
export subdirs := $(subdirs) # Benign, useless in GNU make before 3.63.
# The mach and hurd subdirectories have many generated header files which
export subdirs := $(subdirs) # Benign, useless in GNU make before 3.63.
# The mach and hurd subdirectories have many generated header files which
-#
the much of
rest of the library depends on, so it is best to build them
+#
much of the
rest of the library depends on, so it is best to build them
# first (and mach before hurd, at that). The before-compile additions in
# sysdeps/{mach,hurd}/Makefile should make it reliably work for these files
# not to exist when making in other directories, but it will be slower that
# first (and mach before hurd, at that). The before-compile additions in
# sysdeps/{mach,hurd}/Makefile should make it reliably work for these files
# not to exist when making in other directories, but it will be slower that
@@
-79,7
+81,8
@@
subdirs := $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
no-libc.a bin lib \
data headers others)
\f
no-libc.a bin lib \
data headers others)
\f
-headers := features.h errno.h sys/errno.h errnos.h limits.h
+headers := errno.h sys/errno.h errnos.h limits.h values.h \
+ features.h gnu-versions.h
aux = sysdep $(libc-init) version
echo-headers: subdir_echo-headers
aux = sysdep $(libc-init) version
echo-headers: subdir_echo-headers
@@
-141,7
+144,9
@@
$(includedir)/stubs.h: subdir_install
echo ' in the C library which is a stub, meaning it will fail';\
echo ' every time called, usually setting errno to ENOSYS. */';\
sort $(subdir-stubs)) > $(objpfx)stubs.h
echo ' in the C library which is a stub, meaning it will fail';\
echo ' every time called, usually setting errno to ENOSYS. */';\
sort $(subdir-stubs)) > $(objpfx)stubs.h
- $(INSTALL_DATA) $(objpfx)stubs.h $@
+ if test -r $@ && cmp -s $(objpfx)stubs.h $@; \
+ then echo stubs.h unchanged ; \
+ else $(INSTALL_DATA) $(objpfx)stubs.h $@; fi
rm -f $(objpfx)stubs.h
\f
# This makes the Info or DVI file of the documentation from the Texinfo source.
rm -f $(objpfx)stubs.h
\f
# This makes the Info or DVI file of the documentation from the Texinfo source.
@@
-171,7
+176,9
@@
$(all-subdirs-targets):
# Subroutines of all cleaning targets.
parent-mostlyclean: common-mostlyclean # common-mostlyclean is in Makerules.
# Subroutines of all cleaning targets.
parent-mostlyclean: common-mostlyclean # common-mostlyclean is in Makerules.
- -rm -f $(common-objpfx)libc.a $(addprefix $(objpfx),$(install-lib))
+ -rm -f $(foreach o,$(object-suffixes),\
+ $(common-objpfx)$(patsubst %,$(libtype$o),c)) \
+ $(addprefix $(objpfx),$(install-lib))
parent-clean: parent-mostlyclean common-clean
-rm -f $(addprefix $(common-objpfx),$(common-generated))
-rm -f $(addprefix $(objpfx),sysd-Makefile sysd-dirs sysd-rules)
parent-clean: parent-mostlyclean common-clean
-rm -f $(addprefix $(common-objpfx),$(common-generated))
-rm -f $(addprefix $(objpfx),sysd-Makefile sysd-dirs sysd-rules)
@@
-197,8
+204,8
@@
realclean distclean: parent-clean
# Subroutine of distclean and realclean.
distclean-1: subdir_$(distclean-1)
-rm -f $(config-generated)
# Subroutine of distclean and realclean.
distclean-1: subdir_$(distclean-1)
-rm -f $(config-generated)
- -rm -f $(addprefix $(objpfx),config.status c
ache.cache
)
- -rm -f $(addprefix $(objpfx),config.make config-name.h)
+ -rm -f $(addprefix $(objpfx),config.status c
onfig.cache config.log
)
+ -rm -f $(addprefix $(objpfx),config.make config-name.h
config.h
)
ifdef objdir
-rm -f $(objpfx)Makefile
endif
ifdef objdir
-rm -f $(objpfx)Makefile
endif
@@
-215,7
+222,7
@@
parent_echo-distinfo:
\f
# Make the distribution tarfile.
\f
# Make the distribution tarfile.
-distribute := README INSTALL
NOTES COPYING.LIB COPYING NEWS
\
+distribute := README INSTALL
FAQ NOTES COPYING.LIB COPYING NEWS
\
ChangeLog ChangeLog.[0-9] \
Makefile Makeconfig Makerules Rules Make-dist MakeTAGS \
extra-lib.mk o-iterator.mk \
ChangeLog ChangeLog.[0-9] \
Makefile Makeconfig Makerules Rules Make-dist MakeTAGS \
extra-lib.mk o-iterator.mk \