diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-02-10 19:42:58 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-02-10 19:42:58 +0000 |
| commit | eca3eb3b9cab56dfb95ab2890b4077b98d8c12de (patch) | |
| tree | a55466a3999d4108265c23d4fdd9dc2cb57289fd | |
| parent | f43898bd299efc2116f69d24d145015a7f532ed0 (diff) | |
(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.
| -rw-r--r-- | Makeconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makeconfig b/Makeconfig index 1e8d605bae..86109fce0b 100644 --- a/Makeconfig +++ b/Makeconfig @@ -566,7 +566,7 @@ ifeq (yes,$(build-shared)) # The PIC object files are named foo.os. object-suffixes += .os CPPFLAGS-.os = -DPIC -CFLAGS-.os = $(pic-ccflag) -fno-common +CFLAGS-.os = $(pic-ccflag) libtype.os := lib%_pic.a # This can be changed by a sysdep makefile pic-ccflag = -fPIC @@ -621,6 +621,7 @@ ifeq (yes, $(build-shared)) # Process the shlib-versions file, which tells us what shared library # version numbers to use when we install shared objects on this system. -include $(common-objpfx)soversions.mk +ifndef avoid-generated $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \ $(wildcard $(patsubst %, $(..)%/shlib-versions,\ $(add-ons))) \ @@ -648,9 +649,14 @@ $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \ done; \ done;) > $@T; exit 0 mv -f $@T $@ +endif + +postclean-generated += soversions.mk +ifndef avoid-generated # Get $(version) defined with the release version number. -include $(common-objpfx)version.mk +endif # Generate the header containing the names of all shared libraries. # We use a stamp file to avoid uncessary recompilations. |