(CFLAGS-.os): Kill -fno-common. ($(common-objpfx)soversions.mk): Don't generate if avoid-generated is set. (postclean-generated): Add soversion.mk. ($(common-objpfx)version.mk): Don't include if avoid-generated is set.

This commit is contained in:
Ulrich Drepper 1998-02-10 19:42:58 +00:00
parent f43898bd29
commit eca3eb3b9c

View File

@ -566,7 +566,7 @@ ifeq (yes,$(build-shared))
# The PIC object files are named foo.os. # The PIC object files are named foo.os.
object-suffixes += .os object-suffixes += .os
CPPFLAGS-.os = -DPIC CPPFLAGS-.os = -DPIC
CFLAGS-.os = $(pic-ccflag) -fno-common CFLAGS-.os = $(pic-ccflag)
libtype.os := lib%_pic.a libtype.os := lib%_pic.a
# This can be changed by a sysdep makefile # This can be changed by a sysdep makefile
pic-ccflag = -fPIC pic-ccflag = -fPIC
@ -621,6 +621,7 @@ ifeq (yes, $(build-shared))
# Process the shlib-versions file, which tells us what shared library # Process the shlib-versions file, which tells us what shared library
# version numbers to use when we install shared objects on this system. # version numbers to use when we install shared objects on this system.
-include $(common-objpfx)soversions.mk -include $(common-objpfx)soversions.mk
ifndef avoid-generated
$(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \ $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \
$(wildcard $(patsubst %, $(..)%/shlib-versions,\ $(wildcard $(patsubst %, $(..)%/shlib-versions,\
$(add-ons))) \ $(add-ons))) \
@ -648,9 +649,14 @@ $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \
done; \ done; \
done;) > $@T; exit 0 done;) > $@T; exit 0
mv -f $@T $@ mv -f $@T $@
endif
postclean-generated += soversions.mk
ifndef avoid-generated
# Get $(version) defined with the release version number. # Get $(version) defined with the release version number.
-include $(common-objpfx)version.mk -include $(common-objpfx)version.mk
endif
# Generate the header containing the names of all shared libraries. # Generate the header containing the names of all shared libraries.
# We use a stamp file to avoid uncessary recompilations. # We use a stamp file to avoid uncessary recompilations.