From 4390d8e705e11eec6c2eed552ceea25277fdbde3 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 13 Feb 2006 09:57:02 +0000 Subject: libc-{a,so,multi}-y replaced by libc-y covering common objects both in libc.a/libc.so, the diffs go into libc-static-y/libc-shared-y exclusively, add IMA to libc, don't use any MSRC anymore --- libc/misc/assert/Makefile.in | 19 +++++------ libc/misc/ctype/Makefile.in | 62 ++++++++++++---------------------- libc/misc/dirent/Makefile.in | 21 +++++------- libc/misc/error/Makefile.in | 19 +++++------ libc/misc/file/Makefile.in | 20 +++++------ libc/misc/fnmatch/Makefile.in | 21 +++++------- libc/misc/ftw/Makefile.in | 15 ++++----- libc/misc/glob/Makefile.in | 21 +++++------- libc/misc/gnu/Makefile.in | 19 +++++------ libc/misc/internals/Makefile.in | 25 ++++++-------- libc/misc/locale/Makefile.in | 50 ++++++--------------------- libc/misc/mntent/Makefile.in | 19 +++++------ libc/misc/pthread/Makefile.in | 9 ++--- libc/misc/regex/Makefile.in | 21 +++++------- libc/misc/search/Makefile.in | 75 +++++++++-------------------------------- libc/misc/statfs/Makefile.in | 21 +++++------- libc/misc/syslog/Makefile.in | 19 +++++------ libc/misc/sysvipc/Makefile.in | 66 ++++++++---------------------------- libc/misc/time/Makefile.in | 67 ++++++++++-------------------------- libc/misc/ttyent/Makefile.in | 19 +++++------ libc/misc/utmp/Makefile.in | 19 +++++------ libc/misc/wchar/Makefile.in | 35 +++++++------------ libc/misc/wctype/Makefile.in | 58 +++++++++++-------------------- libc/misc/wordexp/Makefile.in | 19 +++++------ 24 files changed, 247 insertions(+), 492 deletions(-) (limited to 'libc/misc') diff --git a/libc/misc/assert/Makefile.in b/libc/misc/assert/Makefile.in index 0e41268b2..20f9c2115 100644 --- a/libc/misc/assert/Makefile.in +++ b/libc/misc/assert/Makefile.in @@ -1,25 +1,22 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=__assert.c +CSRC := __assert.c -MISC_ASSERT_DIR:=$(top_srcdir)libc/misc/assert -MISC_ASSERT_OUT:=$(top_builddir)libc/misc/assert +MISC_ASSERT_DIR := $(top_srcdir)libc/misc/assert +MISC_ASSERT_OUT := $(top_builddir)libc/misc/assert -MISC_ASSERT_SRC:=$(MISC_ASSERT_DIR)/__assert.c -MISC_ASSERT_OBJ:=$(MISC_ASSERT_OUT)/__assert.o +MISC_ASSERT_SRC := $(MISC_ASSERT_DIR)/__assert.c +MISC_ASSERT_OBJ := $(MISC_ASSERT_OUT)/__assert.o -libc-a-y+=$(MISC_ASSERT_OBJ) -libc-so-y+=$(MISC_ASSERT_OBJ:.o=.os) +libc-y += $(MISC_ASSERT_OBJ) -libc-multi-y+=$(MISC_ASSERT_SRC) - -objclean-y+=misc_assert_objclean +objclean-y += misc_assert_objclean misc_assert_objclean: $(RM) $(MISC_ASSERT_OUT)/*.{o,os} diff --git a/libc/misc/ctype/Makefile.in b/libc/misc/ctype/Makefile.in index 87a3d11b1..b8a07ec84 100644 --- a/libc/misc/ctype/Makefile.in +++ b/libc/misc/ctype/Makefile.in @@ -1,59 +1,39 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -MSRC:=ctype.c -MOBJ:= isalnum.o isalpha.o isascii.o iscntrl.o isdigit.o \ - isgraph.o islower.o isprint.o ispunct.o isspace.o \ - isupper.o isxdigit.o toascii.o tolower.o toupper.o \ - isblank.o +# multi source ctype.c +COM_SRC := \ + isalnum.c isalpha.c isascii.c iscntrl.c isdigit.c \ + isgraph.c islower.c isprint.c ispunct.c isspace.c \ + isupper.c isxdigit.c toascii.c tolower.c toupper.c \ + isblank.c + +CSRC := $(COM_SRC) ifeq ($(UCLIBC_HAS_CTYPE_TABLES),y) -MOBJ+= __C_ctype_b.o __C_ctype_tolower.o __C_ctype_toupper.o \ - __ctype_b_loc.o __ctype_tolower_loc.o __ctype_toupper_loc.o \ - __ctype_assert.o isctype.o +CSRC += __C_ctype_b.c __C_ctype_tolower.c __C_ctype_toupper.c \ + __ctype_b_loc.c __ctype_tolower_loc.c __ctype_toupper_loc.c \ + __ctype_assert.c isctype.c endif -MOBJx:= isalnum_l.o isalpha_l.o isascii_l.o iscntrl_l.o isdigit_l.o \ - isgraph_l.o islower_l.o isprint_l.o ispunct_l.o isspace_l.o \ - isupper_l.o isxdigit_l.o toascii_l.o tolower_l.o toupper_l.o \ - isblank_l.o - -MISC_CTYPE_DIR:=$(top_srcdir)libc/misc/ctype -MISC_CTYPE_OUT:=$(top_builddir)libc/misc/ctype - -MISC_CTYPE_MSRC:=$(MISC_CTYPE_DIR)/$(MSRC) -MISC_CTYPE_MOBJ:=$(patsubst %.o,$(MISC_CTYPE_OUT)/%.o,$(MOBJ)) -MISC_CTYPE_MOBJx:=$(patsubst %.o,$(MISC_CTYPE_OUT)/%.o,$(MOBJx)) - -MISC_CTYPE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_CTYPE_MOBJ)))) - -$(MISC_CTYPE_MOBJ): $(MISC_CTYPE_MSRC) - $(compile.m) - -$(MISC_CTYPE_MOBJ:.o=.os): $(MISC_CTYPE_MSRC) - $(compile.m) - -$(MISC_CTYPE_MOBJx): $(MISC_CTYPE_MSRC) - $(compile.m) -D__UCLIBC_DO_XLOCALE +ifeq ($(UCLIBC_HAS_XLOCALE),y) +CSRC += $(patsubst %.c,%_l.c,$(COM_SRC)) +endif -$(MISC_CTYPE_MOBJx:.o=.os): $(MISC_CTYPE_MSRC) - $(compile.m) -D__UCLIBC_DO_XLOCALE +MISC_CTYPE_DIR := $(top_srcdir)libc/misc/ctype +MISC_CTYPE_OUT := $(top_builddir)libc/misc/ctype -libc-a-y+=$(MISC_CTYPE_MOBJ) -libc-a-$(UCLIBC_HAS_XLOCALE)+=$(MISC_CTYPE_MOBJx) -libc-so-y+=$(MISC_CTYPE_MOBJ:.o=.os) -libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_CTYPE_MOBJx:.o=.os) +MISC_CTYPE_SRC := $(patsubst %.c,$(MISC_CTYPE_DIR)/%.c,$(CSRC)) +MISC_CTYPE_OBJ := $(patsubst %.c,$(MISC_CTYPE_OUT)/%.o,$(CSRC)) -CFLAGS-multi-y+=$(MISC_CTYPE_DEF) -libc-multi-y+=$(MISC_CTYPE_MSRC) -libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_CTYPE_MOBJx) +libc-y += $(MISC_CTYPE_OBJ) -objclean-y+=misc_ctype_objclean +objclean-y += misc_ctype_objclean misc_ctype_objclean: $(RM) $(MISC_CTYPE_OUT)/*.{o,os} diff --git a/libc/misc/dirent/Makefile.in b/libc/misc/dirent/Makefile.in index e1dfa3d94..d17ad8a17 100644 --- a/libc/misc/dirent/Makefile.in +++ b/libc/misc/dirent/Makefile.in @@ -1,30 +1,27 @@ # Makefile for uClibc # # Copyright (C) 2001 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:= alphasort.c closedir.c dirfd.c opendir.c readdir.c rewinddir.c scandir.c \ +CSRC := alphasort.c closedir.c dirfd.c opendir.c readdir.c rewinddir.c scandir.c \ seekdir.c telldir.c readdir_r.c ifeq ($(UCLIBC_HAS_LFS),y) -CSRC+= readdir64.c alphasort64.c scandir64.c readdir64_r.c +CSRC += readdir64.c alphasort64.c scandir64.c readdir64_r.c endif -MISC_DIRENT_DIR:=$(top_srcdir)libc/misc/dirent -MISC_DIRENT_OUT:=$(top_builddir)libc/misc/dirent +MISC_DIRENT_DIR := $(top_srcdir)libc/misc/dirent +MISC_DIRENT_OUT := $(top_builddir)libc/misc/dirent -MISC_DIRENT_SRC:=$(patsubst %.c,$(MISC_DIRENT_DIR)/%.c,$(CSRC)) -MISC_DIRENT_OBJ:=$(patsubst %.c,$(MISC_DIRENT_OUT)/%.o,$(CSRC)) +MISC_DIRENT_SRC := $(patsubst %.c,$(MISC_DIRENT_DIR)/%.c,$(CSRC)) +MISC_DIRENT_OBJ := $(patsubst %.c,$(MISC_DIRENT_OUT)/%.o,$(CSRC)) -libc-a-y+=$(MISC_DIRENT_OBJ) -libc-so-y+=$(MISC_DIRENT_OBJ:.o=.os) +libc-y += $(MISC_DIRENT_OBJ) -libc-multi-y+=$(MISC_DIRENT_SRC) - -objclean-y+=misc_dirent_objclean +objclean-y += misc_dirent_objclean misc_dirent_objclean: $(RM) $(MISC_DIRENT_OUT)/*.{o,os} diff --git a/libc/misc/error/Makefile.in b/libc/misc/error/Makefile.in index 2977256d9..c529e955e 100644 --- a/libc/misc/error/Makefile.in +++ b/libc/misc/error/Makefile.in @@ -1,24 +1,21 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=error.c err.c +CSRC := error.c err.c -MISC_ERROR_DIR:=$(top_srcdir)libc/misc/error -MISC_ERROR_OUT:=$(top_builddir)libc/misc/error +MISC_ERROR_DIR := $(top_srcdir)libc/misc/error +MISC_ERROR_OUT := $(top_builddir)libc/misc/error -MISC_ERROR_SRC:=$(patsubst %.c,$(MISC_ERROR_DIR)/%.c,$(CSRC)) -MISC_ERROR_OBJ:=$(patsubst %.c,$(MISC_ERROR_OUT)/%.o,$(CSRC)) +MISC_ERROR_SRC := $(patsubst %.c,$(MISC_ERROR_DIR)/%.c,$(CSRC)) +MISC_ERROR_OBJ := $(patsubst %.c,$(MISC_ERROR_OUT)/%.o,$(CSRC)) -libc-a-y+=$(MISC_ERROR_OBJ) -libc-so-y+=$(MISC_ERROR_OBJ:.o=.os) +libc-y += $(MISC_ERROR_OBJ) -libc-multi-y+=$(MISC_ERROR_SRC) - -objclean-y+=misc_error_objclean +objclean-y += misc_error_objclean misc_error_objclean: $(RM) $(MISC_ERROR_OUT)/*.{o,os} diff --git a/libc/misc/file/Makefile.in b/libc/misc/file/Makefile.in index 9410a887a..b5f0ec4b3 100644 --- a/libc/misc/file/Makefile.in +++ b/libc/misc/file/Makefile.in @@ -1,27 +1,23 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -MISC_FILE_DIR:=$(top_srcdir)libc/misc/file -MISC_FILE_OUT:=$(top_builddir)libc/misc/file +MISC_FILE_DIR := $(top_srcdir)libc/misc/file +MISC_FILE_OUT := $(top_builddir)libc/misc/file -MISC_FILE_SRC:=$(wildcard $(MISC_FILE_DIR)/*.c) +MISC_FILE_SRC := $(wildcard $(MISC_FILE_DIR)/*.c) ifneq ($(UCLIBC_HAS_LFS),y) -MISC_FILE_SRC:=$(filter-out $(MISC_FILE_DIR)/lockf64.c,$(MISC_FILE_SRC)) +MISC_FILE_SRC := $(filter-out $(MISC_FILE_DIR)/lockf64.c,$(MISC_FILE_SRC)) endif -MISC_FILE_OBJ:=$(patsubst $(MISC_FILE_DIR)/%.c,$(MISC_FILE_OUT)/%.o,$(MISC_FILE_SRC)) +MISC_FILE_OBJ := $(patsubst $(MISC_FILE_DIR)/%.c,$(MISC_FILE_OUT)/%.o,$(MISC_FILE_SRC)) -libc-a-y+=$(MISC_FILE_OBJ) -libc-so-y+=$(MISC_FILE_OBJ:.o=.os) +libc-y += $(MISC_FILE_OBJ) -libc-multi-y+=$(MISC_FILE_DIR)/lockf.c -libc-nomulti-$(UCLIBC_HAS_LFS)+=$(MISC_FILE_OUT)/lockf64.o - -objclean-y+=misc_file_objclean +objclean-y += misc_file_objclean misc_file_objclean: $(RM) $(MISC_FILE_OUT)/*.{o,os} diff --git a/libc/misc/fnmatch/Makefile.in b/libc/misc/fnmatch/Makefile.in index 61e125f9f..31873d676 100644 --- a/libc/misc/fnmatch/Makefile.in +++ b/libc/misc/fnmatch/Makefile.in @@ -1,29 +1,26 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # ifeq ($(UCLIBC_HAS_FNMATCH_OLD),y) -CSRC:=fnmatch_old.c +CSRC := fnmatch_old.c else -CSRC:=fnmatch.c +CSRC := fnmatch.c endif -MISC_FNMATCH_DIR:=$(top_srcdir)libc/misc/fnmatch -MISC_FNMATCH_OUT:=$(top_builddir)libc/misc/fnmatch +MISC_FNMATCH_DIR := $(top_srcdir)libc/misc/fnmatch +MISC_FNMATCH_OUT := $(top_builddir)libc/misc/fnmatch -MISC_FNMATCH_SRC:=$(patsubst %.c,$(MISC_FNMATCH_DIR)/%.c,$(CSRC)) -MISC_FNMATCH_OBJ:=$(patsubst %.c,$(MISC_FNMATCH_OUT)/%.o,$(CSRC)) +MISC_FNMATCH_SRC := $(patsubst %.c,$(MISC_FNMATCH_DIR)/%.c,$(CSRC)) +MISC_FNMATCH_OBJ := $(patsubst %.c,$(MISC_FNMATCH_OUT)/%.o,$(CSRC)) -libc-a-$(UCLIBC_HAS_FNMATCH)+=$(MISC_FNMATCH_OBJ) -libc-so-$(UCLIBC_HAS_FNMATCH)+=$(MISC_FNMATCH_OBJ:.o=.os) +libc-$(UCLIBC_HAS_FNMATCH) += $(MISC_FNMATCH_OBJ) -libc-multi-$(UCLIBC_HAS_FNMATCH)+=$(MISC_FNMATCH_SRC) - -objclean-y+=misc_fnmatch_objclean +objclean-y += misc_fnmatch_objclean misc_fnmatch_objclean: $(RM) $(MISC_FNMATCH_OUT)/*.{o,os} diff --git a/libc/misc/ftw/Makefile.in b/libc/misc/ftw/Makefile.in index 6c0304bc8..501b9084d 100644 --- a/libc/misc/ftw/Makefile.in +++ b/libc/misc/ftw/Makefile.in @@ -1,25 +1,22 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -SRC := ftw.c +CSRC := ftw.c ifeq ($(UCLIBC_HAS_LFS),y) -SRC += ftw64.c +CSRC += ftw64.c endif MISC_FTW_DIR := $(top_srcdir)libc/misc/ftw MISC_FTW_OUT := $(top_builddir)libc/misc/ftw -MISC_FTW_SRC := $(patsubst %.c,$(MISC_FTW_DIR)/%.c,$(SRC)) -MISC_FTW_OBJ := $(patsubst %.c,$(MISC_FTW_OUT)/%.o,$(SRC)) +MISC_FTW_SRC := $(patsubst %.c,$(MISC_FTW_DIR)/%.c,$(CSRC)) +MISC_FTW_OBJ := $(patsubst %.c,$(MISC_FTW_OUT)/%.o,$(CSRC)) -libc-a-$(UCLIBC_HAS_FTW) += $(MISC_FTW_OBJ) -libc-so-$(UCLIBC_HAS_FTW) += $(MISC_FTW_OBJ:.o=.os) - -libc-multi-$(UCLIBC_HAS_FTW) += $(MISC_FTW_SRC) +libc-$(UCLIBC_HAS_FTW) += $(MISC_FTW_OBJ) objclean-y += misc_ftw_objclean diff --git a/libc/misc/glob/Makefile.in b/libc/misc/glob/Makefile.in index cd845464f..278456667 100644 --- a/libc/misc/glob/Makefile.in +++ b/libc/misc/glob/Makefile.in @@ -1,31 +1,26 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=glob.c glob64.c glob-hooks.c +CSRC := glob.c glob64.c glob-hooks.c -MISC_GLOB_DIR:=$(top_srcdir)libc/misc/glob -MISC_GLOB_OUT:=$(top_builddir)libc/misc/glob +MISC_GLOB_DIR := $(top_srcdir)libc/misc/glob +MISC_GLOB_OUT := $(top_builddir)libc/misc/glob -MISC_GLOB_SRC:=$(patsubst %.c,$(MISC_GLOB_DIR)/%.c,$(CSRC)) -MISC_GLOB_OBJ:=$(patsubst %.c,$(MISC_GLOB_OUT)/%.o,$(CSRC)) +MISC_GLOB_SRC := $(patsubst %.c,$(MISC_GLOB_DIR)/%.c,$(CSRC)) +MISC_GLOB_OBJ := $(patsubst %.c,$(MISC_GLOB_OUT)/%.o,$(CSRC)) $(MISC_GLOB_OUT)/glob64.o: $(MISC_GLOB_DIR)/glob64.c $(MISC_GLOB_DIR)/glob.c $(MISC_GLOB_OUT)/glob64.os: $(MISC_GLOB_DIR)/glob64.c $(MISC_GLOB_DIR)/glob.c -libc-a-$(UCLIBC_HAS_GLOB)+=$(MISC_GLOB_OBJ) -libc-so-$(UCLIBC_HAS_GLOB)+=$(MISC_GLOB_OBJ:.o=.os) +libc-$(UCLIBC_HAS_GLOB) += $(MISC_GLOB_OBJ) -# glob has to be rewritten to allow multi -#libc-multi-$(UCLIBC_HAS_GLOB)+=$(MISC_GLOB_SRC) -libc-nomulti-$(UCLIBC_HAS_GLOB)+=$(MISC_GLOB_OBJ) - -objclean-y+=misc_glob_objclean +objclean-y += misc_glob_objclean misc_glob_objclean: $(RM) $(MISC_GLOB_OUT)/*.{o,os} diff --git a/libc/misc/gnu/Makefile.in b/libc/misc/gnu/Makefile.in index d3ba2e549..bcd9400c3 100644 --- a/libc/misc/gnu/Makefile.in +++ b/libc/misc/gnu/Makefile.in @@ -1,25 +1,22 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=obstack.c +CSRC := obstack.c -MISC_GNU_DIR:=$(top_srcdir)libc/misc/gnu -MISC_GNU_OUT:=$(top_builddir)libc/misc/gnu +MISC_GNU_DIR := $(top_srcdir)libc/misc/gnu +MISC_GNU_OUT := $(top_builddir)libc/misc/gnu -MISC_GNU_SRC:=$(MISC_GNU_DIR)/obstack.c -MISC_GNU_OBJ:=$(MISC_GNU_OUT)/obstack.o +MISC_GNU_SRC := $(MISC_GNU_DIR)/obstack.c +MISC_GNU_OBJ := $(MISC_GNU_OUT)/obstack.o -libc-a-y+=$(MISC_GNU_OBJ) -libc-so-y+=$(MISC_GNU_OBJ:.o=.os) +libc-y += $(MISC_GNU_OBJ) -libc-multi-y+=$(MISC_GNU_SRC) - -objclean-y+=misc_gnu_objclean +objclean-y += misc_gnu_objclean misc_gnu_objclean: $(RM) $(MISC_GNU_OUT)/*.{o,os} diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in index 4c7012d9a..70712b834 100644 --- a/libc/misc/internals/Makefile.in +++ b/libc/misc/internals/Makefile.in @@ -1,29 +1,26 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CFLAGS-__uClibc_main.c:=$(SSP_DISABLE_FLAGS) +CFLAGS-__uClibc_main.c := $(SSP_DISABLE_FLAGS) -CSRC:=tempname.c errno.c __errno_location.c __h_errno_location.c +CSRC := tempname.c errno.c __errno_location.c __h_errno_location.c -MISC_INTERNALS_DIR:=$(top_srcdir)libc/misc/internals -MISC_INTERNALS_OUT:=$(top_builddir)libc/misc/internals +MISC_INTERNALS_DIR := $(top_srcdir)libc/misc/internals +MISC_INTERNALS_OUT := $(top_builddir)libc/misc/internals -MISC_INTERNALS_SRC:=$(patsubst %.c,$(MISC_INTERNALS_DIR)/%.c,$(CSRC)) -MISC_INTERNALS_OBJ:=$(patsubst %.c,$(MISC_INTERNALS_OUT)/%.o,$(CSRC)) +MISC_INTERNALS_SRC := $(patsubst %.c,$(MISC_INTERNALS_DIR)/%.c,$(CSRC)) +MISC_INTERNALS_OBJ := $(patsubst %.c,$(MISC_INTERNALS_OUT)/%.o,$(CSRC)) -libc-a-y+=$(MISC_INTERNALS_OBJ) -libc-so-y+=$(MISC_INTERNALS_OBJ:.o=.os) -libc-shared-y+=$(MISC_INTERNALS_OUT)/__uClibc_main.oS -libc-static-y+=$(MISC_INTERNALS_OUT)/__uClibc_main.o +libc-y += $(MISC_INTERNALS_OBJ) +libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.oS +libc-static-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o -libc-multi-y+=$(MISC_INTERNALS_SRC) - -objclean-y+=misc_internals_objclean +objclean-y += misc_internals_objclean misc_internals_objclean: $(RM) $(MISC_INTERNALS_OUT)/*.{o,os,oS} diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in index f4439cdf5..66b9809fa 100644 --- a/libc/misc/locale/Makefile.in +++ b/libc/misc/locale/Makefile.in @@ -1,57 +1,29 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -MSRC:=locale.c -MOBJ:=setlocale.o localeconv.o _locale_init.o nl_langinfo.o -MOBJx:= - +# multi source locale.c +CSRC := setlocale.c localeconv.c _locale_init.c nl_langinfo.c ifeq ($(UCLIBC_HAS_LOCALE),y) -MOBJ+=newlocale.o __locale_mbrtowc_l.o +CSRC += newlocale.c __locale_mbrtowc_l.c endif - ifeq ($(UCLIBC_HAS_XLOCALE),y) -MOBJx:=nl_langinfo_l.o duplocale.o freelocale.o uselocale.o __curlocale.o +CSRC += nl_langinfo_l.c duplocale.c freelocale.c uselocale.c __curlocale.c endif -MISC_LOCALE_NO_MULTI=localeconv.o - -MISC_LOCALE_DIR:=$(top_srcdir)libc/misc/locale -MISC_LOCALE_OUT:=$(top_builddir)libc/misc/locale - -MISC_LOCALE_MSRC:=$(MISC_LOCALE_DIR)/$(MSRC) -MISC_LOCALE_MOBJ:=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJ)) -MISC_LOCALE_MOBJx:=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJx)) - -MISC_LOCALE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_LOCALE_NO_MULTI),$(notdir $(MISC_LOCALE_MOBJ))))) - -$(MISC_LOCALE_MOBJ): $(MISC_LOCALE_MSRC) - $(compile.m) - -$(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_DIR := $(top_srcdir)libc/misc/locale +MISC_LOCALE_OUT := $(top_builddir)libc/misc/locale -libc-a-y+=$(MISC_LOCALE_MOBJ) -libc-a-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx) -libc-so-y+=$(MISC_LOCALE_MOBJ:.o=.os) -libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx:.o=.os) +MISC_LOCALE_SRC := $(patsubst %.c,$(MISC_LOCALE_DIR)/%.c,$(CSRC)) +MISC_LOCALE_OBJ := $(patsubst %.c,$(MISC_LOCALE_OUT)/%.o,$(CSRC)) -CFLAGS-multi-y+=$(MISC_LOCALE_DEF) -libc-multi-y+=$(MISC_LOCALE_MSRC) -libc-nomulti-y+=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MISC_LOCALE_NO_MULTI)) -libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx) +libc-y += $(MISC_LOCALE_OBJ) -objclean-y+=misc_locale_objclean +objclean-y += misc_locale_objclean misc_locale_objclean: $(RM) $(MISC_LOCALE_OUT)/{*.{o,os}} diff --git a/libc/misc/mntent/Makefile.in b/libc/misc/mntent/Makefile.in index c1674f494..b633e4eb2 100644 --- a/libc/misc/mntent/Makefile.in +++ b/libc/misc/mntent/Makefile.in @@ -1,25 +1,22 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=mntent.c +CSRC := mntent.c -MISC_MNTENT_DIR:=$(top_srcdir)libc/misc/mntent -MISC_MNTENT_OUT:=$(top_builddir)libc/misc/mntent +MISC_MNTENT_DIR := $(top_srcdir)libc/misc/mntent +MISC_MNTENT_OUT := $(top_builddir)libc/misc/mntent -MISC_MNTENT_SRC:=$(MISC_MNTENT_DIR)/mntent.c -MISC_MNTENT_OBJ:=$(MISC_MNTENT_OUT)/mntent.o +MISC_MNTENT_SRC := $(MISC_MNTENT_DIR)/mntent.c +MISC_MNTENT_OBJ := $(MISC_MNTENT_OUT)/mntent.o -libc-a-y+=$(MISC_MNTENT_OBJ) -libc-so-y+=$(MISC_MNTENT_OBJ:.o=.os) +libc-y += $(MISC_MNTENT_OBJ) -libc-multi-y+=$(MISC_MNTENT_SRC) - -objclean-y+=misc_mntent_objclean +objclean-y += misc_mntent_objclean misc_mntent_objclean: $(RM) $(MISC_MNTENT_OUT)/*.{o,os} diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in index 7ce9a84ae..b7821888d 100644 --- a/libc/misc/pthread/Makefile.in +++ b/libc/misc/pthread/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -8,11 +8,8 @@ MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread -MISC_PTHREAD_CSRC := no-tsd.c -MISC_PTHREAD_STATIC_CSRC := weaks.c - -libc-static-$(UCLIBC_HAS_THREADS) += $(patsubst %.c,$(MISC_PTHREAD_OUT)/%.o,$(MISC_PTHREAD_STATIC_CSRC)) -libc-shared-$(UCLIBC_HAS_THREADS) += $(patsubst %.c,$(MISC_PTHREAD_OUT)/%.oS,$(MISC_PTHREAD_CSRC)) +libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o +libc-shared-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/no-tsd.oS objclean-y += misc_pthread_objclean diff --git a/libc/misc/regex/Makefile.in b/libc/misc/regex/Makefile.in index 9cd403add..4e76dee36 100644 --- a/libc/misc/regex/Makefile.in +++ b/libc/misc/regex/Makefile.in @@ -1,29 +1,26 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # ifeq ($(UCLIBC_HAS_REGEX_OLD),y) -CSRC:=regex_old.c +CSRC := regex_old.c else -CSRC:=regex.c +CSRC := regex.c endif -MISC_REGEX_DIR:=$(top_srcdir)libc/misc/regex -MISC_REGEX_OUT:=$(top_builddir)libc/misc/regex +MISC_REGEX_DIR := $(top_srcdir)libc/misc/regex +MISC_REGEX_OUT := $(top_builddir)libc/misc/regex -MISC_REGEX_SRC:=$(patsubst %.c,$(MISC_REGEX_DIR)/%.c,$(CSRC)) -MISC_REGEX_OBJ:=$(patsubst %.c,$(MISC_REGEX_OUT)/%.o,$(CSRC)) +MISC_REGEX_SRC := $(patsubst %.c,$(MISC_REGEX_DIR)/%.c,$(CSRC)) +MISC_REGEX_OBJ := $(patsubst %.c,$(MISC_REGEX_OUT)/%.o,$(CSRC)) -libc-a-$(UCLIBC_HAS_REGEX)+=$(MISC_REGEX_OBJ) -libc-so-$(UCLIBC_HAS_REGEX)+=$(MISC_REGEX_OBJ:.o=.os) +libc-$(UCLIBC_HAS_REGEX) += $(MISC_REGEX_OBJ) -libc-multi-$(UCLIBC_HAS_REGEX)+=$(MISC_REGEX_SRC) - -objclean-y+=misc_regex_objclean +objclean-y += misc_regex_objclean misc_regex_objclean: $(RM) $(MISC_REGEX_OUT)/*.{o,os} diff --git a/libc/misc/search/Makefile.in b/libc/misc/search/Makefile.in index fade671c9..80fafbf6c 100644 --- a/libc/misc/search/Makefile.in +++ b/libc/misc/search/Makefile.in @@ -1,77 +1,34 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -MSRC1:=_tsearch.c -MOBJ1:=tsearch.o tfind.o tdelete.o twalk.o tdestroy.o +CSRC := hsearch.c -MSRC2:=_lsearch.c -MOBJ2:=lfind.o lsearch.o +# multi source _tsearch.c +CSRC += tsearch.c tfind.c tdelete.c twalk.c tdestroy.c -MSRC3:=insremque.c -MOBJ3:=insque.o remque.o +# multi source _lsearch.c +CSRC += lfind.c lsearch.c -MSRC4:=_hsearch_r.c -MOBJ4:=hcreate_r.o hdestroy_r.o hsearch_r.o +# multi source insremque.c +CSRC += insque.c remque.c -CSRC:=hsearch.c +# multi source _hsearch_r.c +CSRC += hcreate_r.c hdestroy_r.c hsearch_r.c -MISC_SEARCH_DIR:=$(top_srcdir)libc/misc/search -MISC_SEARCH_OUT:=$(top_builddir)libc/misc/search +MISC_SEARCH_DIR := $(top_srcdir)libc/misc/search +MISC_SEARCH_OUT := $(top_builddir)libc/misc/search -MISC_SEARCH_SRC:=$(patsubst %.c,$(MISC_SEARCH_DIR)/%.c,$(CSRC)) -MISC_SEARCH_OBJ:=$(patsubst %.c,$(MISC_SEARCH_OUT)/%.o,$(CSRC)) +MISC_SEARCH_SRC := $(patsubst %.c,$(MISC_SEARCH_DIR)/%.c,$(CSRC)) +MISC_SEARCH_OBJ := $(patsubst %.c,$(MISC_SEARCH_OUT)/%.o,$(CSRC)) -MISC_SEARCH_MSRC1:=$(MISC_SEARCH_DIR)/$(MSRC1) -MISC_SEARCH_MSRC2:=$(MISC_SEARCH_DIR)/$(MSRC2) -MISC_SEARCH_MSRC3:=$(MISC_SEARCH_DIR)/$(MSRC3) -MISC_SEARCH_MSRC4:=$(MISC_SEARCH_DIR)/$(MSRC4) -MISC_SEARCH_MOBJ1:=$(patsubst %.o,$(MISC_SEARCH_OUT)/%.o,$(MOBJ1)) -MISC_SEARCH_MOBJ2:=$(patsubst %.o,$(MISC_SEARCH_OUT)/%.o,$(MOBJ2)) -MISC_SEARCH_MOBJ3:=$(patsubst %.o,$(MISC_SEARCH_OUT)/%.o,$(MOBJ3)) -MISC_SEARCH_MOBJ4:=$(patsubst %.o,$(MISC_SEARCH_OUT)/%.o,$(MOBJ4)) +libc-y += $(MISC_SEARCH_OBJ) -MISC_SEARCH_MSRC:=$(MISC_SEARCH_MSRC1) $(MISC_SEARCH_MSRC2) $(MISC_SEARCH_MSRC3) $(MISC_SEARCH_MSRC4) -MISC_SEARCH_MOBJ:=$(MISC_SEARCH_MOBJ1) $(MISC_SEARCH_MOBJ2) $(MISC_SEARCH_MOBJ3) $(MISC_SEARCH_MOBJ4) -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_MSRC1) - $(compile.m) - -$(MISC_SEARCH_MOBJ1:.o=.os): $(MISC_SEARCH_MSRC1) - $(compile.m) - -$(MISC_SEARCH_MOBJ2): $(MISC_SEARCH_MSRC2) - $(compile.m) - -$(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-so-y+=$(MISC_SEARCH_OBJS:.o=.os) - -CFLAGS-multi-y+=$(MISC_SEARCH_DEF) -libc-multi-y+=$(MISC_SEARCH_SRC) $(MISC_SEARCH_MSRC) - -objclean-y+=misc_search_objclean +objclean-y += misc_search_objclean misc_search_objclean: $(RM) $(MISC_SEARCH_OUT)/*.{o,os} diff --git a/libc/misc/statfs/Makefile.in b/libc/misc/statfs/Makefile.in index 9350e221e..7858c8351 100644 --- a/libc/misc/statfs/Makefile.in +++ b/libc/misc/statfs/Makefile.in @@ -1,27 +1,24 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=statvfs.c fstatvfs.c +CSRC := statvfs.c fstatvfs.c ifeq ($(UCLIBC_HAS_LFS),y) -CSRC+=fstatfs64.c statfs64.c statvfs64.c fstatvfs64.c +CSRC += fstatfs64.c statfs64.c statvfs64.c fstatvfs64.c endif -MISC_STATFS_DIR:=$(top_srcdir)libc/misc/statfs -MISC_STATFS_OUT:=$(top_builddir)libc/misc/statfs +MISC_STATFS_DIR := $(top_srcdir)libc/misc/statfs +MISC_STATFS_OUT := $(top_builddir)libc/misc/statfs -MISC_STATFS_SRC:=$(patsubst %.c,$(MISC_STATFS_DIR)/%.c,$(CSRC)) -MISC_STATFS_OBJ:=$(patsubst %.c,$(MISC_STATFS_OUT)/%.o,$(CSRC)) +MISC_STATFS_SRC := $(patsubst %.c,$(MISC_STATFS_DIR)/%.c,$(CSRC)) +MISC_STATFS_OBJ := $(patsubst %.c,$(MISC_STATFS_OUT)/%.o,$(CSRC)) -libc-a-y+=$(MISC_STATFS_OBJ) -libc-so-y+=$(MISC_STATFS_OBJ:.o=.os) +libc-y += $(MISC_STATFS_OBJ) -libc-multi-y+=$(MISC_STATFS_SRC) - -objclean-y+=misc_statfs_objclean +objclean-y += misc_statfs_objclean misc_statfs_objclean: $(RM) $(MISC_STATFS_OUT)/*.{o,os} diff --git a/libc/misc/syslog/Makefile.in b/libc/misc/syslog/Makefile.in index c1cd2ee18..b1d87e85d 100644 --- a/libc/misc/syslog/Makefile.in +++ b/libc/misc/syslog/Makefile.in @@ -1,25 +1,22 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=syslog.c +CSRC := syslog.c -MISC_SYSLOG_DIR:=$(top_srcdir)libc/misc/syslog -MISC_SYSLOG_OUT:=$(top_builddir)libc/misc/syslog +MISC_SYSLOG_DIR := $(top_srcdir)libc/misc/syslog +MISC_SYSLOG_OUT := $(top_builddir)libc/misc/syslog -MISC_SYSLOG_SRC:=$(patsubst %.c,$(MISC_SYSLOG_DIR)/%.c,$(CSRC)) -MISC_SYSLOG_OBJ:=$(patsubst %.c,$(MISC_SYSLOG_OUT)/%.o,$(CSRC)) +MISC_SYSLOG_SRC := $(patsubst %.c,$(MISC_SYSLOG_DIR)/%.c,$(CSRC)) +MISC_SYSLOG_OBJ := $(patsubst %.c,$(MISC_SYSLOG_OUT)/%.o,$(CSRC)) -libc-a-y+=$(MISC_SYSLOG_OBJ) -libc-so-y+=$(MISC_SYSLOG_OBJ:.o=.os) +libc-y += $(MISC_SYSLOG_OBJ) -libc-multi-y+=$(MISC_SYSLOG_SRC) - -objclean-y+=misc_syslog_objclean +objclean-y += misc_syslog_objclean misc_syslog_objclean: $(RM) $(MISC_SYSLOG_OUT)/*.{o,os} diff --git a/libc/misc/sysvipc/Makefile.in b/libc/misc/sysvipc/Makefile.in index 9a4446cb3..44707d643 100644 --- a/libc/misc/sysvipc/Makefile.in +++ b/libc/misc/sysvipc/Makefile.in @@ -1,69 +1,31 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -MSRC1:=sem.c -MOBJ1:=semget.o semctl.o semop.o +CSRC := ftok.c -MSRC2:=shm.c -MOBJ2:=shmat.o shmctl.o shmdt.o shmget.o +# multi source sem.c +CSRC += semget.c semctl.c semop.c -MSRC3:=msgq.c -MOBJ3:=msgctl.o msgget.o msgrcv.o msgsnd.o +# multi source shm.c +CSRC += shmat.c shmctl.c shmdt.c shmget.c -CSRC:=ftok.c +# multi source msgq.c +CSRC += msgctl.c msgget.c msgrcv.c msgsnd.c -MISC_SYSVIPC_DIR:=$(top_srcdir)libc/misc/sysvipc -MISC_SYSVIPC_OUT:=$(top_builddir)libc/misc/sysvipc +MISC_SYSVIPC_DIR := $(top_srcdir)libc/misc/sysvipc +MISC_SYSVIPC_OUT := $(top_builddir)libc/misc/sysvipc -MISC_SYSVIPC_SRC:=$(patsubst %.c,$(MISC_SYSVIPC_DIR)/%.c,$(CSRC)) -MISC_SYSVIPC_OBJ:=$(patsubst %.c,$(MISC_SYSVIPC_OUT)/%.o,$(CSRC)) +MISC_SYSVIPC_SRC := $(patsubst %.c,$(MISC_SYSVIPC_DIR)/%.c,$(CSRC)) +MISC_SYSVIPC_OBJ := $(patsubst %.c,$(MISC_SYSVIPC_OUT)/%.o,$(CSRC)) -MISC_SYSVIPC_NO_MULTI:=$(MOBJ1) $(MOBJ3) +libc-y += $(MISC_SYSVIPC_OBJ) -MISC_SYSVIPC_MSRC1:=$(patsubst %.c,$(MISC_SYSVIPC_DIR)/%.c,$(MSRC1)) -MISC_SYSVIPC_MSRC2:=$(patsubst %.c,$(MISC_SYSVIPC_DIR)/%.c,$(MSRC2)) -MISC_SYSVIPC_MSRC3:=$(patsubst %.c,$(MISC_SYSVIPC_DIR)/%.c,$(MSRC3)) -MISC_SYSVIPC_MOBJ1:=$(patsubst %.o,$(MISC_SYSVIPC_OUT)/%.o,$(MOBJ1)) -MISC_SYSVIPC_MOBJ2:=$(patsubst %.o,$(MISC_SYSVIPC_OUT)/%.o,$(MOBJ2)) -MISC_SYSVIPC_MOBJ3:=$(patsubst %.o,$(MISC_SYSVIPC_OUT)/%.o,$(MOBJ3)) - -MISC_SYSVIPC_MSRC:=$(MISC_SYSVIPC_MSRC1) $(MISC_SYSVIPC_MSRC2) $(MISC_SYSVIPC_MSRC3) -MISC_SYSVIPC_MOBJ:=$(MISC_SYSVIPC_MOBJ1) $(MISC_SYSVIPC_MOBJ2) $(MISC_SYSVIPC_MOBJ3) - -MISC_SYSVIPC_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_SYSVIPC_MOBJ)))) - -MISC_SYSVIPC_OBJS:=$(MISC_SYSVIPC_OBJ) $(MISC_SYSVIPC_MOBJ) - -$(MISC_SYSVIPC_MOBJ1): $(MISC_SYSVIPC_MSRC1) - $(compile.m) - -$(MISC_SYSVIPC_MOBJ1:.o=.os): $(MISC_SYSVIPC_MSRC1) - $(compile.m) - -$(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-so-y+=$(MISC_SYSVIPC_OBJS:.o=.os) - -CFLAGS-multi-y+=$(MISC_SYSVIPC_DEF) -libc-multi-y+=$(MISC_SYSVIPC_SRC) $(MISC_SYSVIPC_MSRC) - -objclean-y+=misc_sysvipc_objclean +objclean-y += misc_sysvipc_objclean misc_sysvipc_objclean: $(RM) $(MISC_SYSVIPC_OUT)/*.{o,os} diff --git a/libc/misc/time/Makefile.in b/libc/misc/time/Makefile.in index b62032a25..b710b8b7c 100644 --- a/libc/misc/time/Makefile.in +++ b/libc/misc/time/Makefile.in @@ -1,73 +1,40 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -MSRC:=time.c -MOBJ:= asctime.o asctime_r.o clock.o ctime.o ctime_r.o gmtime.o gmtime_r.o \ - localtime.o localtime_r.o mktime.o strftime.o strptime.o tzset.o \ - _time_t2tm.o __time_tm.o _time_mktime.o dysize.o timegm.o \ - _time_mktime_tzi.o _time_localtime_tzi.o -MOBJx:= +CSRC := adjtime.c ftime.c +# multi source time.c +CSRC += asctime.c asctime_r.c clock.c ctime.c ctime_r.c gmtime.c gmtime_r.c \ + localtime.c localtime_r.c mktime.c strftime.c strptime.c tzset.c \ + _time_t2tm.c __time_tm.c _time_mktime.c dysize.c timegm.c \ + _time_mktime_tzi.c _time_localtime_tzi.c ifeq ($(UCLIBC_HAS_FLOATS),y) -MOBJ+=difftime.o +CSRC += difftime.c endif ifeq ($(UCLIBC_HAS_XLOCALE),y) -MOBJx:=strftime_l.o strptime_l.o +CSRC += strftime_l.c strptime_l.c endif - ifeq ($(UCLIBC_HAS_WCHAR),y) -MOBJ+=wcsftime.o +CSRC += wcsftime.c ifeq ($(UCLIBC_HAS_XLOCALE),y) -MOBJx+=wcsftime_l.o +CSRC += wcsftime_l.c endif endif -CSRC:=adjtime.c ftime.c - -MISC_TIME_DIR:=$(top_srcdir)libc/misc/time -MISC_TIME_OUT:=$(top_builddir)libc/misc/time - -MISC_TIME_NO_MULTI:=strftime.o mktime.o strptime.o gmtime.o localtime.o asctime.o asctime_r.o gmtime_r.o localtime_r.o - -MISC_TIME_SRC:=$(patsubst %.c,$(MISC_TIME_DIR)/%.c,$(CSRC)) -MISC_TIME_OBJ:=$(patsubst %.c,$(MISC_TIME_OUT)/%.o,$(CSRC)) - -MISC_TIME_MSRC:=$(patsubst %.c,$(MISC_TIME_DIR)/%.c,$(MSRC)) -MISC_TIME_MOBJ:=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJ)) -MISC_TIME_MOBJx:=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJx)) - -MISC_TIME_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_TIME_NO_MULTI),$(notdir $(MISC_TIME_MOBJ))))) - -MISC_TIME_OBJS:=$(MISC_TIME_OBJ) $(MISC_TIME_MOBJ) - -$(MISC_TIME_MOBJ): $(MISC_TIME_MSRC) - $(compile.m) - -$(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 +MISC_TIME_DIR := $(top_srcdir)libc/misc/time +MISC_TIME_OUT := $(top_builddir)libc/misc/time -libc-a-y+=$(MISC_TIME_OBJS) -libc-a-$(UCLIBC_HAS_XLOCALE)+=$(MISC_TIME_MOBJx) -libc-so-y+=$(MISC_TIME_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_TIME_MOBJx:.o=.os) +MISC_TIME_SRC := $(patsubst %.c,$(MISC_TIME_DIR)/%.c,$(CSRC)) +MISC_TIME_OBJ := $(patsubst %.c,$(MISC_TIME_OUT)/%.o,$(CSRC)) -CFLAGS-multi-y+=$(MISC_TIME_DEF) -libc-multi-y+=$(MISC_TIME_MSRC) -libc-nomulti-y+=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MISC_TIME_NO_MULTI)) -libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_TIME_MOBJx) +libc-y += $(MISC_TIME_OBJ) -objclean-y+=misc_time_objclean +objclean-y += misc_time_objclean misc_time_objclean: $(RM) $(MISC_TIME_OUT)/*.{o,os} diff --git a/libc/misc/ttyent/Makefile.in b/libc/misc/ttyent/Makefile.in index eff772546..288a4c09b 100644 --- a/libc/misc/ttyent/Makefile.in +++ b/libc/misc/ttyent/Makefile.in @@ -1,24 +1,21 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=getttyent.c +CSRC := getttyent.c -MISC_TTYENT_DIR:=$(top_srcdir)libc/misc/ttyent -MISC_TTYENT_OUT:=$(top_builddir)libc/misc/ttyent +MISC_TTYENT_DIR := $(top_srcdir)libc/misc/ttyent +MISC_TTYENT_OUT := $(top_builddir)libc/misc/ttyent -MISC_TTYENT_SRC:=$(patsubst %.c,$(MISC_TTYENT_DIR)/%.c,$(CSRC)) -MISC_TTYENT_OBJ:=$(patsubst %.c,$(MISC_TTYENT_OUT)/%.o,$(CSRC)) +MISC_TTYENT_SRC := $(patsubst %.c,$(MISC_TTYENT_DIR)/%.c,$(CSRC)) +MISC_TTYENT_OBJ := $(patsubst %.c,$(MISC_TTYENT_OUT)/%.o,$(CSRC)) -libc-a-y+=$(MISC_TTYENT_OBJ) -libc-so-y+=$(MISC_TTYENT_OBJ:.o=.os) +libc-y += $(MISC_TTYENT_OBJ) -libc-multi-y+=$(MISC_TTYENT_SRC) - -objclean-y+=misc_ttyent_objclean +objclean-y += misc_ttyent_objclean misc_ttyent_objclean: $(RM) $(MISC_TTYENT_OUT)/*.{o,os} diff --git a/libc/misc/utmp/Makefile.in b/libc/misc/utmp/Makefile.in index 2a0fe0f13..5e584372c 100644 --- a/libc/misc/utmp/Makefile.in +++ b/libc/misc/utmp/Makefile.in @@ -1,25 +1,22 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=utent.c wtent.c +CSRC := utent.c wtent.c -MISC_UTMP_DIR:=$(top_srcdir)libc/misc/utmp -MISC_UTMP_OUT:=$(top_builddir)libc/misc/utmp +MISC_UTMP_DIR := $(top_srcdir)libc/misc/utmp +MISC_UTMP_OUT := $(top_builddir)libc/misc/utmp -MISC_UTMP_SRC:=$(patsubst %.c,$(MISC_UTMP_DIR)/%.c,$(CSRC)) -MISC_UTMP_OBJ:=$(patsubst %.c,$(MISC_UTMP_OUT)/%.o,$(CSRC)) +MISC_UTMP_SRC := $(patsubst %.c,$(MISC_UTMP_DIR)/%.c,$(CSRC)) +MISC_UTMP_OBJ := $(patsubst %.c,$(MISC_UTMP_OUT)/%.o,$(CSRC)) -libc-a-y+=$(MISC_UTMP_OBJ) -libc-so-y+=$(MISC_UTMP_OBJ:.o=.os) +libc-y += $(MISC_UTMP_OBJ) -libc-multi-y+=$(MISC_UTMP_SRC) - -objclean-y+=misc_utmp_objclean +objclean-y += misc_utmp_objclean misc_utmp_objclean: $(RM) $(MISC_UTMP_OUT)/*.{o,os} diff --git a/libc/misc/wchar/Makefile.in b/libc/misc/wchar/Makefile.in index f1d5f3876..64171eb96 100644 --- a/libc/misc/wchar/Makefile.in +++ b/libc/misc/wchar/Makefile.in @@ -1,7 +1,7 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -17,35 +17,24 @@ # wcsftime # -MSRC:=wchar.c -MOBJ:= btowc.o wctob.o mbsinit.o mbrlen.o mbrtowc.o wcrtomb.o mbsrtowcs.o \ - wcsrtombs.o _wchar_utf8sntowcs.o _wchar_wcsntoutf8s.o \ - mbsnrtowcs.o wcsnrtombs.o wcwidth.o wcswidth.o +# multi source wchar.c +CSRC := btowc.c wctob.c mbsinit.c mbrlen.c mbrtowc.c wcrtomb.c mbsrtowcs.c \ + wcsrtombs.c _wchar_utf8sntowcs.c _wchar_wcsntoutf8s.c \ + mbsnrtowcs.c wcsnrtombs.c wcwidth.c wcswidth.c ifeq ($(UCLIBC_HAS_LOCALE),y) -MOBJ+=iconv.o +CSRC += iconv.c endif -MISC_WCHAR_DIR:=$(top_srcdir)libc/misc/wchar -MISC_WCHAR_OUT:=$(top_builddir)libc/misc/wchar +MISC_WCHAR_DIR := $(top_srcdir)libc/misc/wchar +MISC_WCHAR_OUT := $(top_builddir)libc/misc/wchar -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_SRC := $(patsubst %.c,$(MISC_WCHAR_DIR)/%.c,$(CSRC)) +MISC_WCHAR_OBJ := $(patsubst %.c,$(MISC_WCHAR_OUT)/%.o,$(CSRC)) -$(MISC_WCHAR_MOBJ): $(MISC_WCHAR_MSRC) - $(compile.m) +libc-$(UCLIBC_HAS_WCHAR) += $(MISC_WCHAR_OBJ) -$(MISC_WCHAR_MOBJ:.o=.os): $(MISC_WCHAR_MSRC) - $(compile.m) - -libc-a-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_MOBJ) -libc-so-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_MOBJ:.o=.os) - -CFLAGS-multi-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_DEF) -libc-multi-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_MSRC) - -objclean-y+=misc_wchar_objclean +objclean-y += misc_wchar_objclean misc_wchar_objclean: $(RM) $(MISC_WCHAR_OUT)/*.{o,os} diff --git a/libc/misc/wctype/Makefile.in b/libc/misc/wctype/Makefile.in index 556b98856..0dcd485de 100644 --- a/libc/misc/wctype/Makefile.in +++ b/libc/misc/wctype/Makefile.in @@ -1,53 +1,35 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -MSRC:=_wctype.c -MOBJ:= iswalnum.o iswalpha.o iswcntrl.o iswdigit.o iswgraph.o \ - iswlower.o iswprint.o iswpunct.o iswspace.o iswupper.o \ - iswxdigit.o iswblank.o wctrans.o towctrans.o \ - wctype.o iswctype.o towlower.o towupper.o +# multi source _wctype.c +COM_SRC := \ + iswalnum.c iswalpha.c iswcntrl.c iswdigit.c iswgraph.c \ + iswlower.c iswprint.c iswpunct.c iswspace.c iswupper.c \ + iswxdigit.c iswblank.c wctrans.c towctrans.c \ + wctype.c iswctype.c towlower.c towupper.c -MOBJx:= iswalnum_l.o iswalpha_l.o iswcntrl_l.o iswdigit_l.o iswgraph_l.o \ - iswlower_l.o iswprint_l.o iswpunct_l.o iswspace_l.o iswupper_l.o \ - iswxdigit_l.o iswblank_l.o \ - wctype_l.o iswctype_l.o wctrans_l.o towctrans_l.o towlower_l.o towupper_l.o +CSRC := +ifeq ($(UCLIBC_HAS_WCHAR),y) +CSRC += $(COM_SRC) +endif +ifeq ($(UCLIBC_HAS_XLOCALE),y) +CSRC += $(patsubst %.c,%_l.c,$(COM_SRC)) +endif -MISC_WCTYPE_DIR:=$(top_srcdir)libc/misc/wctype -MISC_WCTYPE_OUT:=$(top_builddir)libc/misc/wctype +MISC_WCTYPE_DIR := $(top_srcdir)libc/misc/wctype +MISC_WCTYPE_OUT := $(top_builddir)libc/misc/wctype -MISC_WCTYPE_MSRC:=$(MISC_WCTYPE_DIR)/$(MSRC) -MISC_WCTYPE_MOBJ:=$(patsubst %.o,$(MISC_WCTYPE_OUT)/%.o,$(MOBJ)) -MISC_WCTYPE_MOBJx:=$(patsubst %.o,$(MISC_WCTYPE_OUT)/%.o,$(MOBJx)) +MISC_WCTYPE_SRC := $(patsubst %.c,$(MISC_WCTYPE_DIR)/%.c,$(CSRC)) +MISC_WCTYPE_OBJ := $(patsubst %.c,$(MISC_WCTYPE_OUT)/%.o,$(CSRC)) -MISC_WCTYPE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_WCTYPE_MOBJ)))) +libc-y += $(MISC_WCTYPE_OBJ) -$(MISC_WCTYPE_MOBJ): $(MISC_WCTYPE_MSRC) - $(compile.m) - -$(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-a-$(UCLIBC_HAS_XLOCALE)+=$(MISC_WCTYPE_MOBJx) -libc-so-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCTYPE_MOBJ:.o=.os) -libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_WCTYPE_MOBJx:.o=.os) - -CFLAGS-multi-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCTYPE_DEF) -libc-multi-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCTYPE_MSRC) -libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_WCTYPE_MOBJx) - -objclean-y+=misc_wctype_objclean +objclean-y += misc_wctype_objclean misc_wctype_objclean: $(RM) $(MISC_WCTYPE_OUT)/*.{o,os} diff --git a/libc/misc/wordexp/Makefile.in b/libc/misc/wordexp/Makefile.in index f4094d5c2..526807f25 100644 --- a/libc/misc/wordexp/Makefile.in +++ b/libc/misc/wordexp/Makefile.in @@ -1,24 +1,21 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:=wordexp.c +CSRC := wordexp.c -MISC_WORDEXP_DIR:=$(top_srcdir)libc/misc/wordexp -MISC_WORDEXP_OUT:=$(top_builddir)libc/misc/wordexp +MISC_WORDEXP_DIR := $(top_srcdir)libc/misc/wordexp +MISC_WORDEXP_OUT := $(top_builddir)libc/misc/wordexp -MISC_WORDEXP_SRC:=$(patsubst %.c,$(MISC_WORDEXP_DIR)/%.c,$(CSRC)) -MISC_WORDEXP_OBJ:=$(patsubst %.c,$(MISC_WORDEXP_OUT)/%.o,$(CSRC)) +MISC_WORDEXP_SRC := $(patsubst %.c,$(MISC_WORDEXP_DIR)/%.c,$(CSRC)) +MISC_WORDEXP_OBJ := $(patsubst %.c,$(MISC_WORDEXP_OUT)/%.o,$(CSRC)) -libc-a-$(UCLIBC_HAS_WORDEXP)+=$(MISC_WORDEXP_OBJ) -libc-so-$(UCLIBC_HAS_WORDEXP)+=$(MISC_WORDEXP_OBJ:.o=.os) +libc-$(UCLIBC_HAS_WORDEXP) += $(MISC_WORDEXP_OBJ) -libc-multi-$(UCLIBC_HAS_WORDEXP)+=$(MISC_WORDEXP_SRC) - -objclean-y+=misc_wordexp_objclean +objclean-y += misc_wordexp_objclean misc_wordexp_objclean: $(RM) $(MISC_WORDEXP_OUT)/*.{o,os} -- cgit v1.2.3