From e077860853db46c4813969257c1a9e3025f0974f Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 1 Nov 2005 22:12:53 +0000 Subject: Only because of multi sources I had to touch up these and add code duplication --- libc/misc/ctype/Makefile.in | 10 ++++++++-- libc/misc/ftw/Makefile.in | 5 ++++- libc/misc/intl/Makefile.in | 5 ++++- libc/misc/locale/Makefile.in | 15 ++++++++++++--- libc/misc/search/Makefile.in | 20 ++++++++++++++++---- libc/misc/sysvipc/Makefile.in | 15 ++++++++++++--- libc/misc/time/Makefile.in | 10 ++++++++-- libc/misc/wchar/Makefile.in | 5 ++++- libc/misc/wctype/Makefile.in | 10 ++++++++-- 9 files changed, 76 insertions(+), 19 deletions(-) (limited to 'libc/misc') diff --git a/libc/misc/ctype/Makefile.in b/libc/misc/ctype/Makefile.in index a496d19a8..8b67514be 100644 --- a/libc/misc/ctype/Makefile.in +++ b/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) diff --git a/libc/misc/ftw/Makefile.in b/libc/misc/ftw/Makefile.in index 07adba6ff..50be20aeb 100644 --- a/libc/misc/ftw/Makefile.in +++ b/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) diff --git a/libc/misc/intl/Makefile.in b/libc/misc/intl/Makefile.in index 0ec7b5aa4..6daa22dd9 100644 --- a/libc/misc/intl/Makefile.in +++ b/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) diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in index bdf42204d..e2fa8158a 100644 --- a/libc/misc/locale/Makefile.in +++ b/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) diff --git a/libc/misc/search/Makefile.in b/libc/misc/search/Makefile.in index 8d6586e75..943ef34d0 100644 --- a/libc/misc/search/Makefile.in +++ b/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) diff --git a/libc/misc/sysvipc/Makefile.in b/libc/misc/sysvipc/Makefile.in index 751f05b0f..9c91c4c53 100644 --- a/libc/misc/sysvipc/Makefile.in +++ b/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) diff --git a/libc/misc/time/Makefile.in b/libc/misc/time/Makefile.in index 06da935be..91ca6e396 100644 --- a/libc/misc/time/Makefile.in +++ b/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) diff --git a/libc/misc/wchar/Makefile.in b/libc/misc/wchar/Makefile.in index da63e22de..9059d71d8 100644 --- a/libc/misc/wchar/Makefile.in +++ b/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) diff --git a/libc/misc/wctype/Makefile.in b/libc/misc/wctype/Makefile.in index 31b6567f8..b7bdbd8f8 100644 --- a/libc/misc/wctype/Makefile.in +++ b/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) -- cgit v1.2.3