From 32242e7e10276157533def1c92c4c720945510fc Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 9 Feb 2009 21:48:48 +0000
Subject: unify the headers/random defines into porting.h to avoid
 duplication/rot

---
 utils/Makefile.in | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'utils/Makefile.in')

diff --git a/utils/Makefile.in b/utils/Makefile.in
index a4c104a47..163b5a665 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -9,6 +9,9 @@
 
 CFLAGS-utils := \
     $(SSP_ALL_CFLAGS) \
+    -I$(top_srcdir)ldso/include \
+    -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
+    -DUCLIBC_LDSO=$(UCLIBC_LDSO) \
     -I$(top_srcdir)/$(KERNEL_HEADERS) \
     -DNOT_IN_libc \
     -B$(top_builddir)lib \
@@ -20,21 +23,14 @@ else
 CFLAGS-utils-shared :=
 endif
 
-CFLAGS-ldconfig := \
-    -I$(top_srcdir)ldso/include \
-    -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-    -DUCLIBC_LDSO=$(UCLIBC_LDSO)
+CFLAGS-ldconfig :=
 ifeq ($(UCLIBC_STATIC_LDCONFIG),y)
 CFLAGS-ldconfig += -static
 else
 CFLAGS-ldconfig += $(CFLAGS-utils-shared)
 endif
 
-CFLAGS-ldd := \
-    -I$(top_srcdir)ldso/include \
-    -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-    -DUCLIBC_LDSO=$(UCLIBC_LDSO) \
-    $(CFLAGS-utils-shared)
+CFLAGS-ldd := $(CFLAGS-utils-shared)
 
 CFLAGS-readelf := $(CFLAGS-utils-shared)
 
@@ -52,22 +48,15 @@ ifeq ($(LDSO_CACHE_SUPPORT),y)
 LDSO_CACHE_SUPPORT := -D__LDSO_CACHE_SUPPORT__=1
 endif
 
-BUILD_CFLAGS-ldconfig.host := \
+BUILD_CFLAGS-utils := \
     -include $(top_srcdir)include/elf.h \
     -I$(top_srcdir)ldso/include \
     -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
     -DUCLIBC_LDSO=$(UCLIBC_LDSO) \
-    $(LDSO_CACHE_SUPPORT) \
-
-BUILD_CFLAGS-ldd.host := \
-    -include $(top_srcdir)include/elf.h \
-    -I$(top_srcdir)ldso/include \
-    -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-    -DUCLIBC_LDSO=$(UCLIBC_LDSO) \
-    $(LDSO_CACHE_SUPPORT) \
-
-BUILD_CFLAGS-readelf.host := \
-    -include $(top_srcdir)include/elf.h \
+    $(LDSO_CACHE_SUPPORT)
+BUILD_CFLAGS-ldconfig.host := $(BUILD_CFLAGS-utils)
+BUILD_CFLAGS-ldd.host      := $(BUILD_CFLAGS-utils)
+BUILD_CFLAGS-readelf.host  := $(BUILD_CFLAGS-utils)
 
 
 # Rules
-- 
cgit v1.2.3