Add info to CFLAGS about lib we are building

diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 0bf5c02..78979f0 100644 (file)
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -5,12 +5,12 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-ldso := -DNOT_IN_libc #-DIS_IN_rtld
+CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS)
 
 # This stuff will not work with -fomit-frame-pointer
 CFLAGS-ldso += -fno-omit-frame-pointer
 
-CFLAGS-ldso += -I$(top_builddir)ldso/include -I$(top_builddir)ldso/ldso $(SSP_DISABLE_FLAGS)
+CFLAGS-ldso += -I$(top_builddir)ldso/include -I$(top_builddir)ldso/ldso
 CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\"
 
 ifeq ($(SUPPORT_LD_DEBUG),y)

diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
index 6622226..77f1890 100644 (file)
--- a/ldso/libdl/Makefile.in
+++ b/ldso/libdl/Makefile.in
@@ -6,9 +6,9 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-libdl := -DNOT_IN_libc
+CFLAGS-libdl := -DNOT_IN_libc -DIS_IN_libdl $(SSP_ALL_CFLAGS)
 
-CFLAGS-libdl +=-I$(top_builddir)ldso/include -I$(top_builddir)ldso/ldso $(SSP_ALL_CFLAGS)
+CFLAGS-libdl +=-I$(top_builddir)ldso/include -I$(top_builddir)ldso/ldso
 
 CFLAGS-libdl += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\"
 

diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
index 6138ef5..9aa0d01 100644 (file)
--- a/libcrypt/Makefile.in
+++ b/libcrypt/Makefile.in
@@ -6,7 +6,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-libcrypt := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-libcrypt := -DNOT_IN_libc -DIS_IN_libcrypt $(SSP_ALL_CFLAGS)
 
 LDFLAGS-libcrypt.so := $(LDFLAGS)
 

diff --git a/libintl/Makefile.in b/libintl/Makefile.in
index 78bcc8d..3fa0759 100644 (file)
--- a/libintl/Makefile.in
+++ b/libintl/Makefile.in
@@ -6,7 +6,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-libintl := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-libintl := -DNOT_IN_libc -DIS_IN_libintl $(SSP_ALL_CFLAGS)
 
 LDFLAGS-libintl.so := $(LDFLAGS)
 

diff --git a/libm/Makefile.in b/libm/Makefile.in
index 4057203..4a021fc 100644 (file)
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -20,7 +20,7 @@
 # by Erik Andersen <andersen@codepoet.org>
 #
 
-CFLAGS-libm := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-libm := -DNOT_IN_libc -DIS_IN_libm $(SSP_ALL_CFLAGS)
 CFLAGS-libm += -D_IEEE_LIBM -D_ISOC99_SOURCE -D_SVID_SOURCE
 
 CFLAGS-libm/$(TARGET_ARCH)/ := $(CFLAGS-libm)

diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in
index 765868e..f3221f4 100644 (file)
--- a/libnsl/Makefile.in
+++ b/libnsl/Makefile.in
@@ -5,7 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-libnsl := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-libnsl := -DNOT_IN_libc -DIS_IN_libnsl $(SSP_ALL_CFLAGS)
 
 LDFLAGS-libnsl.so := $(LDFLAGS)
 

diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in
index d94a076..f7a474a 100644 (file)
--- a/libresolv/Makefile.in
+++ b/libresolv/Makefile.in
@@ -5,7 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-libresolv := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-libresolv := -DNOT_IN_libc -DIS_IN_libresolv $(SSP_ALL_CFLAGS)
 
 LDFLAGS-libresolv.so := $(LDFLAGS)
 

diff --git a/librt/Makefile.in b/librt/Makefile.in
index 7a2a44d..20a22e2 100644 (file)
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@@ -5,7 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-librt := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-librt := -DNOT_IN_libc -DIS_IN_librt $(SSP_ALL_CFLAGS)
 
 LDFLAGS-librt.so := $(LDFLAGS)
 

diff --git a/libutil/Makefile.in b/libutil/Makefile.in
index 79c329a..f6396a6 100644 (file)
--- a/libutil/Makefile.in
+++ b/libutil/Makefile.in
@@ -5,7 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-libutil := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-libutil := -DNOT_IN_libc -DIS_IN_libutil $(SSP_ALL_CFLAGS)
 
 LDFLAGS-libutil.so := $(LDFLAGS)