summaryrefslogtreecommitdiff
path: root/libc/misc/ftw
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-11-03 21:23:07 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-11-03 21:23:07 +0000
commitec2261ba97cc523230aed37979d81092e4b11f14 (patch)
treef971ffb4564f6a75772d21f05fa25936ccad5e5d /libc/misc/ftw
parent48e47d2f49bc42e23a95f3c4830db912a1304388 (diff)
Last bits for IMA, now everything can be built w/ DOMULTI=y on gcc-3.4.4 with my config (no locale, the rest enabled). Not tested if libc is complete and usable. All the files listed in *_NO_MULTI need love, best would be to replace all multisources w/ single sources.
Diffstat (limited to 'libc/misc/ftw')
-rw-r--r--libc/misc/ftw/Makefile.in7
1 files changed, 2 insertions, 5 deletions
diff --git a/libc/misc/ftw/Makefile.in b/libc/misc/ftw/Makefile.in
index 20b8b0e3b..c2cabfa0e 100644
--- a/libc/misc/ftw/Makefile.in
+++ b/libc/misc/ftw/Makefile.in
@@ -11,16 +11,13 @@ MOBJ:=ftw.o ftw64.o
MISC_FTW_DIR:=$(top_srcdir)libc/misc/ftw
MISC_FTW_OUT:=$(top_builddir)libc/misc/ftw
-ifneq ($(DOMULTI),n)
# ftw.c has to be rewritten to allow multi
MISC_FTW_NO_MULTI:=ftw64.o
-MOBJ:=$(filter-out $(MISC_FTW_NO_MULTI),$(MOBJ))
-endif
MISC_FTW_MSRC:=$(MISC_FTW_DIR)/$(MSRC)
MISC_FTW_MOBJ:=$(patsubst %.o,$(MISC_FTW_OUT)/%.o,$(MOBJ))
-MISC_FTW_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_FTW_MOBJ))))
+MISC_FTW_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_FTW_NO_MULTI),$(notdir $(MISC_FTW_MOBJ)))))
MISC_FTW_OBJS:=$(MISC_FTW_MOBJ)
@@ -35,7 +32,7 @@ libc-so-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_OBJS:.o=.os)
CFLAGS-multi-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_DEF)
libc-multi-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_MSRC)
-libc-nomulti-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_OUT)/$(MISC_FTW_NO_MULTI)
+libc-nomulti-$(UCLIBC_HAS_FTW)+=$(patsubst %.o,$(MISC_FTW_OUT)/%.o,$(MISC_FTW_NO_MULTI))
objclean-y+=misc_ftw_objclean