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/unistd/Makefile.in | 55 +++++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 38 deletions(-) (limited to 'libc/unistd') diff --git a/libc/unistd/Makefile.in b/libc/unistd/Makefile.in index 2e6696fc0..198a4eab2 100644 --- a/libc/unistd/Makefile.in +++ b/libc/unistd/Makefile.in @@ -1,60 +1,39 @@ # 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:= sleep.c usleep.c ualarm.c getpass.c sysconf.c getlogin.c \ - fpathconf.c confstr.c pathconf.c swab.c usershell.c \ - getsubopt.c -ifeq ($(ARCH_HAS_MMU),y) -CSRC+= daemon.c -endif +UNISTD_DIR := $(top_srcdir)libc/unistd +UNISTD_OUT := $(top_builddir)libc/unistd -MSRC:=exec.c -MOBJ:=execl.o execv.o execle.o execlp.o execvp.o +CSRC := $(notdir $(wildcard $(UNISTD_DIR)/*.c)) +# multi source +CSRC := $(filter-out exec.c,$(CSRC)) -ifneq ($(ARCH_HAS_MMU),y) -MOBJ+=__exec_alloc.o +ifeq ($(ARCH_HAS_MMU),y) +CSRC := $(filter-out __exec_alloc.c,$(CSRC)) +else +CSRC := $(filter-out daemon.c,$(CSRC)) endif ifeq ($(UCLIBC_HAS_GNU_GETOPT),y) -CSRC+=getopt.c +CSRC := $(filter-out getopt-susv3.c,$(CSRC)) else -CSRC+=getopt-susv3.c +CSRC := $(filter-out getopt.c,$(CSRC)) endif ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) -CSRC:=$(filter-out sleep.c,$(CSRC)) +CSRC := $(filter-out sleep.c,$(CSRC)) endif -UNISTD_DIR:=$(top_srcdir)libc/unistd -UNISTD_OUT:=$(top_builddir)libc/unistd - -UNISTD_SRC:=$(patsubst %.c,$(UNISTD_DIR)/%.c,$(CSRC)) -UNISTD_OBJ:=$(patsubst %.c,$(UNISTD_OUT)/%.o,$(CSRC)) - -UNISTD_MSRC:=$(patsubst %.c,$(UNISTD_DIR)/%.c,$(MSRC)) -UNISTD_MOBJ:=$(patsubst %.o,$(UNISTD_OUT)/%.o,$(MOBJ)) - -UNISTD_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(UNISTD_MOBJ)))) - -UNISTD_OBJS:=$(UNISTD_OBJ) $(UNISTD_MOBJ) - -$(UNISTD_MOBJ): $(UNISTD_MSRC) - $(compile.m) - -$(UNISTD_MOBJ:.o=.os): $(UNISTD_MSRC) - $(compile.m) - -libc-a-y+=$(UNISTD_OBJS) -libc-so-y+=$(UNISTD_OBJS:.o=.os) +UNISTD_SRC := $(patsubst %.c,$(UNISTD_DIR)/%.c,$(CSRC)) +UNISTD_OBJ := $(patsubst %.c,$(UNISTD_OUT)/%.o,$(CSRC)) -CFLAGS-multi-y+=$(UNISTD_DEF) -libc-multi-y+=$(UNISTD_SRC) $(UNISTD_MSRC) +libc-y += $(UNISTD_OBJ) -objclean-y+=unistd_objclean +objclean-y += unistd_objclean unistd_objclean: $(RM) $(UNISTD_OUT)/*.{o,os} -- cgit v1.2.3