buildsys: fix IS_IN_lib*

[uclinux-h8/uClibc.git] / utils / Makefile.in

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 65364d7..d725282 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -10,9 +10,10 @@ subdirs += utils
 
 CFLAGS-utils := \
     $(SSP_ALL_CFLAGS) \
+    -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
     -I$(top_srcdir)ldso/include \
     -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-    -DUCLIBC_LDSO=$(UCLIBC_LDSO) \
+    -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" \
     -I$(top_srcdir)/$(KERNEL_HEADERS) \
     -DNOT_IN_libc \
     -B$(top_builddir)lib \
@@ -36,8 +37,7 @@ CFLAGS-ldd := $(CFLAGS-utils-shared) -DBUILDING_LINKAGE
 # Need CFLAGS-utils explicitly, because the source file is not located in utils
 CFLAGS-iconv := $(CFLAGS-utils) \
     $(CFLAGS-utils-shared) \
-    -I$(top_srcdir)libc/misc/wchar \
-    -DL_iconv_main \
+    -I$(top_srcdir)libc/misc/wchar
 
 CFLAGS-locale := $(CFLAGS-utils)
 CFLAGS-getconf :=$(CFLAGS-utils) \
@@ -45,30 +45,33 @@ CFLAGS-getconf :=$(CFLAGS-utils) \
 
 # "make hostutils" flags
 
-ifeq ($(LDSO_CACHE_SUPPORT),y)
-LDSO_CACHE_SUPPORT := -D__LDSO_CACHE_SUPPORT__=1
-endif
+UTILS_CONFIG_FLAGS-y :=
+UTILS_CONFIG_FLAGS-$(LDSO_CACHE_SUPPORT) += -D__LDSO_CACHE_SUPPORT__
+UTILS_CONFIG_FLAGS-$(LDSO_LDD_SUPPORT) += -D__LDSO_LDD_SUPPORT__
+UTILS_CONFIG_FLAGS-$(LDSO_STANDALONE_SUPPORT) += -D__LDSO_STANDALONE_SUPPORT__
 
 BUILD_CFLAGS-utils := \
     -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-    -DUCLIBC_LDSO=$(UCLIBC_LDSO) \
-    $(LDSO_CACHE_SUPPORT)
-BUILD_CFLAGS-ldconfig.host := $(BUILD_CFLAGS-utils) \
+    -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" \
+    $(UTILS_CONFIG_FLAGS-y)
+BUILD_CFLAGS-ldconfig.host := \
                                -DBUILDING_LINKAGE \
+                               -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
                                -I$(top_srcdir)ldso/include
-BUILD_CFLAGS-ldd.host      := $(BUILD_CFLAGS-utils) \
+BUILD_CFLAGS-ldd.host      := \
                                -DBUILDING_LINKAGE \
+                               -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
                                -I$(top_srcdir)ldso/include \
                                -include $(top_srcdir)include/elf.h
-BUILD_CFLAGS-locale.host   := $(BUILD_CFLAGS-utils) \
+BUILD_CFLAGS-locale.host   := \
                                -DNOT_IN_libc \
                                -I$(top_srcdir)utils/ \
                                -I.
-BUILD_CFLAGS-iconv.host    := $(BUILD_CFLAGS-utils) \
+BUILD_CFLAGS-iconv.host    := \
                        -include $(top_builddir)extra/locale/c8tables.h \
                        -I$(top_srcdir)libc/misc/wchar -DL_iconv_main
 
-BUILD_CFLAGS-getconf.host  := $(BUILD_CFLAGS-utils) \
+BUILD_CFLAGS-getconf.host  := \
                                -DGETCONF_DIR='"$(CURDIR)"'
 
 # Rules