Only because of multi sources I had to touch up these and add code duplication

libc/inet/Makefile.in

@@ -50,13 +50,22 @@ INET_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(INET_MOBJ))))
 
 INET_OBJS:=$(INET_OBJ) $(INET_MOBJ)
 
-$(INET_MOBJ1) $(INET_MOBJ1:.o=.os): $(INET_MSRC1)
+$(INET_MOBJ1): $(INET_MSRC1)
 	$(compile.m)
 
-$(INET_MOBJ2) $(INET_MOBJ2:.o=.os): $(INET_MSRC2)
+$(INET_MOBJ1:.o=.os): $(INET_MSRC1)
 	$(compile.m)
 
-$(INET_MOBJ3) $(INET_MOBJ3:.o=.os): $(INET_MSRC3)
+$(INET_MOBJ2): $(INET_MSRC2)
+	$(compile.m)
+
+$(INET_MOBJ2:.o=.os): $(INET_MSRC2)
+	$(compile.m)
+
+$(INET_MOBJ3): $(INET_MSRC3)
+	$(compile.m)
+
+$(INET_MOBJ3:.o=.os): $(INET_MSRC3)
 	$(compile.m)
 
 libc-a-y+=$(INET_OBJS)

libc/misc/ctype/Makefile.in

@@ -33,10 +33,16 @@ MISC_CTYPE_MOBJx=$(patsubst %.o,$(MISC_CTYPE_OUT)/%.o,$(MOBJx))
 # adapt this if MOBJx is done for multi
 MISC_CTYPE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_CTYPE_MOBJ))))
 
-$(MISC_CTYPE_MOBJ) $(MISC_CTYPE_MOBJ:.o=.os): $(MISC_CTYPE_MSRC)
+$(MISC_CTYPE_MOBJ): $(MISC_CTYPE_MSRC)
 	$(compile.m)
 
-$(MISC_CTYPE_MOBJx) $(MISC_CTYPE_MOBJx:.o=.os): $(MISC_CTYPE_MSRC)
+$(MISC_CTYPE_MOBJ:.o=.os): $(MISC_CTYPE_MSRC)
+	$(compile.m)
+
+$(MISC_CTYPE_MOBJx): $(MISC_CTYPE_MSRC)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(MISC_CTYPE_MOBJx:.o=.os): $(MISC_CTYPE_MSRC)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
 libc-a-y+=$(MISC_CTYPE_MOBJ)

libc/misc/ftw/Makefile.in

@@ -21,7 +21,10 @@ MISC_FTW_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_FTW_MOBJ))))
 
 MISC_FTW_OBJS:=$(MISC_FTW_MOBJ) $(MISC_FTW_OUT)/$(MISC_FTW_NO_MULTI)
 
-$(MISC_FTW_OBJS) $(MISC_FTW_OBJS:.o=.os): $(MISC_FTW_MSRC)
+$(MISC_FTW_OBJS): $(MISC_FTW_MSRC)
+	$(compile.m)
+
+$(MISC_FTW_OBJS:.o=.os): $(MISC_FTW_MSRC)
 	$(compile.m)
 
 libc-a-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_OBJS)

libc/misc/intl/Makefile.in

@@ -17,7 +17,10 @@ MISC_INTL_MSRC:=$(MISC_INTL_DIR)/$(MSRC)
 MISC_INTL_MOBJ:=$(patsubst %.o,$(MISC_INTL_OUT)/%.o,$(MOBJ))
 MISC_INTL_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_INTL_MOBJ))))
 
-$(MISC_INTL_MOBJ) $(MISC_INTL_MOBJ:.o=.os): $(MISC_INTL_MSRC)
+$(MISC_INTL_MOBJ): $(MISC_INTL_MSRC)
+	$(compile.m)
+
+$(MISC_INTL_MOBJ:.o=.os): $(MISC_INTL_MSRC)
 	$(compile.m)
 
 libc-a-$(UCLIBC_HAS_GETTEXT_AWARENESS)+=$(MISC_INTL_MOBJ)

libc/misc/locale/Makefile.in

@@ -33,13 +33,22 @@ MISC_LOCALE_DATA=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(DATA))
 
 MISC_LOCALE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_LOCALE_MOBJ))))
 
-$(MISC_LOCALE_MOBJ) $(MISC_LOCALE_MOBJ:.o=.os): $(MISC_LOCALE_MSRC)
+$(MISC_LOCALE_MOBJ): $(MISC_LOCALE_MSRC)
 	$(compile.m)
 
-$(MISC_LOCALE_MOBJx) $(MISC_LOCALE_MOBJx:.o=.os): $(MISC_LOCALE_MSRC)
+$(MISC_LOCALE_MOBJ:.o=.os): $(MISC_LOCALE_MSRC)
+	$(compile.m)
+
+$(MISC_LOCALE_MOBJx): $(MISC_LOCALE_MSRC)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(MISC_LOCALE_MOBJx:.o=.os): $(MISC_LOCALE_MSRC)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
-$(MISC_LOCALE_DATA) $(MISC_LOCALE_DATA:.o=.os): $(top_builddir)extra/locale/$(notdir $(MISC_LOCALE_DATA:.o=.c))
+$(MISC_LOCALE_DATA): $(top_builddir)extra/locale/$(notdir $(MISC_LOCALE_DATA:.o=.c))
+	$(compile.c) -D__WCHAR_ENABLED -I$(dir $<)
+
+$(MISC_LOCALE_DATA:.o=.os): $(top_builddir)extra/locale/$(notdir $(MISC_LOCALE_DATA:.o=.c))
 	$(compile.c) -D__WCHAR_ENABLED -I$(dir $<)
 
 libc-a-y+=$(MISC_LOCALE_MOBJ)

libc/misc/search/Makefile.in

@@ -41,16 +41,28 @@ MISC_SEARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_SEARCH_MOBJ))))
 
 MISC_SEARCH_OBJS:=$(MISC_SEARCH_OBJ) $(MISC_SEARCH_MOBJ)
 
-$(MISC_SEARCH_MOBJ1) $(MISC_SEARCH_MOBJ1:.o=.os): $(MISC_SEARCH_MSRC1)
+$(MISC_SEARCH_MOBJ1): $(MISC_SEARCH_MSRC1)
 	$(compile.m)
 
-$(MISC_SEARCH_MOBJ2) $(MISC_SEARCH_MOBJ2:.o=.os): $(MISC_SEARCH_MSRC2)
+$(MISC_SEARCH_MOBJ1:.o=.os): $(MISC_SEARCH_MSRC1)
 	$(compile.m)
 
-$(MISC_SEARCH_MOBJ3) $(MISC_SEARCH_MOBJ3:.o=.os): $(MISC_SEARCH_MSRC3)
+$(MISC_SEARCH_MOBJ2): $(MISC_SEARCH_MSRC2)
 	$(compile.m)
 
-$(MISC_SEARCH_MOBJ4) $(MISC_SEARCH_MOBJ4:.o=.os): $(MISC_SEARCH_MSRC4)
+$(MISC_SEARCH_MOBJ2:.o=.os): $(MISC_SEARCH_MSRC2)
+	$(compile.m)
+
+$(MISC_SEARCH_MOBJ3): $(MISC_SEARCH_MSRC3)
+	$(compile.m)
+
+$(MISC_SEARCH_MOBJ3:.o=.os): $(MISC_SEARCH_MSRC3)
+	$(compile.m)
+
+$(MISC_SEARCH_MOBJ4): $(MISC_SEARCH_MSRC4)
+	$(compile.m)
+
+$(MISC_SEARCH_MOBJ4:.o=.os): $(MISC_SEARCH_MSRC4)
 	$(compile.m)
 
 libc-a-y+=$(MISC_SEARCH_OBJS)

libc/misc/sysvipc/Makefile.in

@@ -39,13 +39,22 @@ MISC_SYSVIPC_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_SYSVIPC_MOBJ2))
 
 MISC_SYSVIPC_OBJS:=$(MISC_SYSVIPC_OBJ) $(MISC_SYSVIPC_MOBJ)
 
-$(MISC_SYSVIPC_MOBJ1) $(MISC_SYSVIPC_MOBJ1:.o=.os): $(MISC_SYSVIPC_MSRC1)
+$(MISC_SYSVIPC_MOBJ1): $(MISC_SYSVIPC_MSRC1)
 	$(compile.m)
 
-$(MISC_SYSVIPC_MOBJ2) $(MISC_SYSVIPC_MOBJ2:.o=.os): $(MISC_SYSVIPC_MSRC2)
+$(MISC_SYSVIPC_MOBJ1:.o=.os): $(MISC_SYSVIPC_MSRC1)
 	$(compile.m)
 
-$(MISC_SYSVIPC_MOBJ3) $(MISC_SYSVIPC_MOBJ3:.o=.os): $(MISC_SYSVIPC_MSRC3)
+$(MISC_SYSVIPC_MOBJ2): $(MISC_SYSVIPC_MSRC2)
+	$(compile.m)
+
+$(MISC_SYSVIPC_MOBJ2:.o=.os): $(MISC_SYSVIPC_MSRC2)
+	$(compile.m)
+
+$(MISC_SYSVIPC_MOBJ3): $(MISC_SYSVIPC_MSRC3)
+	$(compile.m)
+
+$(MISC_SYSVIPC_MOBJ3:.o=.os): $(MISC_SYSVIPC_MSRC3)
 	$(compile.m)
 
 libc-a-y+=$(MISC_SYSVIPC_OBJS)

libc/misc/time/Makefile.in

@@ -45,10 +45,16 @@ MISC_TIME_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(filter-out $(MISC_TIME_
 
 MISC_TIME_OBJS:=$(MISC_TIME_OBJ) $(MISC_TIME_MOBJ)
 
-$(MISC_TIME_MOBJ) $(MISC_TIME_MOBJ:.o=.os): $(MISC_TIME_MSRC)
+$(MISC_TIME_MOBJ): $(MISC_TIME_MSRC)
 	$(compile.m)
 
-$(MISC_TIME_MOBJx) $(MISC_TIME_MOBJx:.o=.os): $(MISC_TIME_MSRC)
+$(MISC_TIME_MOBJ:.o=.os): $(MISC_TIME_MSRC)
+	$(compile.m)
+
+$(MISC_TIME_MOBJx): $(MISC_TIME_MSRC)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(MISC_TIME_MOBJx:.o=.os): $(MISC_TIME_MSRC)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
 libc-a-y+=$(MISC_TIME_OBJS)

libc/misc/wchar/Makefile.in

@@ -33,7 +33,10 @@ MISC_WCHAR_MSRC:=$(MISC_WCHAR_DIR)/$(MSRC)
 MISC_WCHAR_MOBJ:=$(patsubst %.o,$(MISC_WCHAR_OUT)/%.o,$(MOBJ))
 MISC_WCHAR_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_WCHAR_MOBJ))))
 
-$(MISC_WCHAR_MOBJ) $(MISC_WCHAR_MOBJ:.o=.os): $(MISC_WCHAR_MSRC)
+$(MISC_WCHAR_MOBJ): $(MISC_WCHAR_MSRC)
+	$(compile.m)
+
+$(MISC_WCHAR_MOBJ:.o=.os): $(MISC_WCHAR_MSRC)
 	$(compile.m)
 
 libc-a-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_MOBJ)

libc/misc/wctype/Makefile.in

@@ -27,10 +27,16 @@ MISC_WCTYPE_MOBJx=$(patsubst %.o,$(MISC_WCTYPE_OUT)/%.o,$(MOBJx))
 # adapt this if MOBJx is done for multi
 MISC_WCTYPE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_WCTYPE_MOBJ))))
 
-$(MISC_WCTYPE_MOBJ) $(MISC_WCTYPE_MOBJ:.o=.os): $(MISC_WCTYPE_MSRC)
+$(MISC_WCTYPE_MOBJ): $(MISC_WCTYPE_MSRC)
 	$(compile.m)
 
-$(MISC_WCTYPE_MOBJx) $(MISC_WCTYPE_MOBJx:.o=.os): $(MISC_WCTYPE_MSRC)
+$(MISC_WCTYPE_MOBJ:.o=.os): $(MISC_WCTYPE_MSRC)
+	$(compile.m)
+
+$(MISC_WCTYPE_MOBJx): $(MISC_WCTYPE_MSRC)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(MISC_WCTYPE_MOBJx:.o=.os): $(MISC_WCTYPE_MSRC)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
 libc-a-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCTYPE_MOBJ)

libc/pwd_grp/Makefile.in

@@ -28,7 +28,10 @@ PWDGRP_MOBJ:=$(patsubst %.o,$(PWDGRP_OUT)/%.o,$(MOBJ))
 
 PWDGRP_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(PWDGRP_MOBJ))))
 
-$(PWDGRP_MOBJ) $(PWDGRP_MOBJ:.o=.os): $(PWDGRP_MSRC)
+$(PWDGRP_MOBJ): $(PWDGRP_MSRC)
+	$(compile.m)
+
+$(PWDGRP_MOBJ:.o=.os): $(PWDGRP_MSRC)
 	$(compile.m)
 
 libc-a-y+=$(PWDGRP_MOBJ)

libc/stdio/Makefile.in

@@ -109,7 +109,10 @@ STDIO_OBJS:=$(STDIO_OBJ) $(STDIO_MOBJ) $(STDIO_CUOBJ) $(STDIO_CLOBJ)
 
 # these need special handling or rewrite to support multi-build
 # CUOBJ
-%_unlocked.o %_unlocked.os: %.c
+%_unlocked.o: %.c
+	$(compile.c) -D__DO_UNLOCKED
+
+%_unlocked.os: %.c
 	$(compile.c) -D__DO_UNLOCKED
 
 # need this, else the other %64 files will get false rules
@@ -122,10 +125,16 @@ $(STDIO_CLOBJ): %.o : %.c
 $(STDIO_CLOBJ:.o=.os): %.os : %.c
 	$(compile.c) -D__DO_LARGEFILE
 
-$(STDIO_MOBJ1) $(STDIO_MOBJ1:.o=.os): $(STDIO_MSRC1)
+$(STDIO_MOBJ1): $(STDIO_MSRC1)
+	$(compile.m)
+
+$(STDIO_MOBJ1:.o=.os): $(STDIO_MSRC1)
+	$(compile.m)
+
+$(STDIO_MOBJ2): $(STDIO_MSRC2)
 	$(compile.m)
 
-$(STDIO_MOBJ2) $(STDIO_MOBJ2:.o=.os): $(STDIO_MSRC2)
+$(STDIO_MOBJ2:.o=.os): $(STDIO_MSRC2)
 	$(compile.m)
 
 libc-a-y+=$(STDIO_OBJS)

libc/stdlib/Makefile.in

@@ -91,19 +91,34 @@ STDLIB_MOBJx:=$(STDLIB_MOBJ1x) $(STDLIB_MOBJ2x)
 
 STDLIB_OBJS:=$(STDLIB_OBJ) $(STDLIB_MOBJ) $(STDLIB_MOBJx)
 
-$(STDLIB_MOBJ1) $(STDLIB_MOBJ1:.o=.os): $(STDLIB_MSRC1)
+$(STDLIB_MOBJ1): $(STDLIB_MSRC1)
 	$(compile.m)
 
-$(STDLIB_MOBJ2) $(STDLIB_MOBJ2:.o=.os): $(STDLIB_MSRC2)
+$(STDLIB_MOBJ1:.o=.os): $(STDLIB_MSRC1)
 	$(compile.m)
 
-$(STDLIB_MOBJ3) $(STDLIB_MOBJ3:.o=.os) $(STDLIB_OUT)/atexit.os: $(STDLIB_MSRC3)
+$(STDLIB_MOBJ2): $(STDLIB_MSRC2)
 	$(compile.m)
 
-$(STDLIB_MOBJ1x) $(STDLIB_MOBJ1x:.o=.os): $(STDLIB_MSRC1)
+$(STDLIB_MOBJ2:.o=.os): $(STDLIB_MSRC2)
+	$(compile.m)
+
+$(STDLIB_MOBJ3): $(STDLIB_MSRC3)
+	$(compile.m)
+
+$(STDLIB_MOBJ3:.o=.os) $(STDLIB_OUT)/atexit.os: $(STDLIB_MSRC3)
+	$(compile.m)
+
+$(STDLIB_MOBJ1x): $(STDLIB_MSRC1)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(STDLIB_MOBJ1x:.o=.os): $(STDLIB_MSRC1)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(STDLIB_MOBJ2x): $(STDLIB_MSRC2)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
-$(STDLIB_MOBJ2x) $(STDLIB_MOBJ2x:.o=.os): $(STDLIB_MSRC2)
+$(STDLIB_MOBJ2x:.o=.os): $(STDLIB_MSRC2)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
 libc-a-y+=$(STDLIB_OBJS)

libc/stdlib/malloc-simple/Makefile.in

@@ -21,7 +21,10 @@ libc-so-$(MALLOC_SIMPLE)+=$(STDLIB_MALLOC_SIMPLE_MOBJ:.o=.os)
 CFLAGS-multi-$(MALLOC_SIMPLE)+=$(STDLIB_MALLOC_SIMPLE_DEF)
 libc-multi-$(MALLOC_SIMPLE)+=$(STDLIB_MALLOC_SIMPLE_MSRC)
 
-$(STDLIB_MALLOC_SIMPLE_MOBJ) $(STDLIB_MALLOC_SIMPLE_MOBJ:.o=.os): $(STDLIB_MALLOC_SIMPLE_MSRC)
+$(STDLIB_MALLOC_SIMPLE_MOBJ): $(STDLIB_MALLOC_SIMPLE_MSRC)
+	$(compile.m)
+
+$(STDLIB_MALLOC_SIMPLE_MOBJ:.o=.os): $(STDLIB_MALLOC_SIMPLE_MSRC)
 	$(compile.m)
 
 objclean-y+=stdlib_malloc_simple_objclean

libc/string/Makefile.in

@@ -67,16 +67,28 @@ STRING_MOBJWx=$(patsubst %.o,$(STRING_OUT)/%.o,$(MOBJWx))
 STRING_Wx=$(STRING_MOBJW) $(STRING_MOBJx) $(STRING_MOBJWx)
 STRING_OBJS:=$(STRING_MOBJ) $(STRING_Wx)
 
-$(STRING_MOBJ) $(STRING_MOBJ:.o=.os): $(STRING_MSRC)
+$(STRING_MOBJ): $(STRING_MSRC)
 	$(compile.m)
 
-$(STRING_MOBJW) $(STRING_MOBJW:.o=.os): $(STRING_MSRC)
+$(STRING_MOBJ:.o=.os): $(STRING_MSRC)
+	$(compile.m)
+
+$(STRING_MOBJW): $(STRING_MSRC)
+	$(compile.m) -DWANT_WIDE
+
+$(STRING_MOBJW:.o=.os): $(STRING_MSRC)
 	$(compile.m) -DWANT_WIDE
 
-$(STRING_MOBJx) $(STRING_MOBJx:.o=.os): $(STRING_MSRC)
+$(STRING_MOBJx): $(STRING_MSRC)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
-$(STRING_MOBJWx) $(STRING_MOBJWx:.o=.os): $(STRING_MSRC)
+$(STRING_MOBJx:.o=.os): $(STRING_MSRC)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(STRING_MOBJWx): $(STRING_MSRC)
+	$(compile.m) -DWANT_WIDE -D__UCLIBC_DO_XLOCALE
+
+$(STRING_MOBJWx:.o=.os): $(STRING_MSRC)
 	$(compile.m) -DWANT_WIDE -D__UCLIBC_DO_XLOCALE
 
 libc-a-y+=$(STRING_OBJS)

libc/string/i386/Makefile.arch

@@ -20,7 +20,10 @@ STRING_ARCH_OBJS:=$(STRING_ARCH_MOBJ)
 
 STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_OBJS))))
 
-$(STRING_ARCH_MOBJ) $(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC)
+$(STRING_ARCH_MOBJ): $(STRING_ARCH_MSRC)
+	$(compile.m)
+
+$(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC)
 	$(compile.m)
 
 libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS)

libc/string/powerpc/Makefile.arch

@@ -18,7 +18,10 @@ STRING_ARCH_OBJS:=$(STRING_ARCH_MOBJ)
 
 STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_MOBJ))))
 
-$(STRING_ARCH_MOBJ) $(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC)
+$(STRING_ARCH_MOBJ): $(STRING_ARCH_MSRC)
+	$(compile.m)
+
+$(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC)
 	$(compile.m)
 
 libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS)

libc/termios/Makefile.in

@@ -25,7 +25,10 @@ TERMIOS_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(TERMIOS_MOBJ))))
 
 TERMIOS_OBJS:=$(TERMIOS_OBJ) $(TERMIOS_MOBJ)
 
-$(TERMIOS_MOBJ) $(TERMIOS_MOBJ:.o=.os): $(TERMIOS_MSRC)
+$(TERMIOS_MOBJ): $(TERMIOS_MSRC)
+	$(compile.m)
+
+$(TERMIOS_MOBJ:.o=.os): $(TERMIOS_MSRC)
 	$(compile.m)
 
 libc-a-y+=$(TERMIOS_OBJS)

libc/unistd/Makefile.in

@@ -35,7 +35,10 @@ UNISTD_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(UNISTD_MOBJ))))
 
 UNISTD_OBJS:=$(UNISTD_OBJ) $(UNISTD_MOBJ)
 
-$(UNISTD_MOBJ) $(UNISTD_MOBJ:.o=.os): $(UNISTD_MSRC)
+$(UNISTD_MOBJ): $(UNISTD_MSRC)
+	$(compile.m)
+
+$(UNISTD_MOBJ:.o=.os): $(UNISTD_MSRC)
 	$(compile.m)
 
 libc-a-y+=$(UNISTD_OBJS)