summaryrefslogtreecommitdiff
path: root/libc/signal
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-02-01 20:28:54 (GMT)
committerKhem Raj <raj.khem@gmail.com>2010-02-01 20:28:54 (GMT)
commit9e22545a13d62299c59b048ae5923bf6da14ff9f (patch)
tree2aab233cda445781073c1f7f9dec154b867aa139 /libc/signal
parente999106d1b95e63283e9bb8246e5c34e9c1e85f7 (diff)
parent22de495da40d7649eb28fdfc70ce1d5f3b6572ea (diff)
Merge commit 'origin/master' into nptl
Conflicts: libc/stdlib/Makefile.in Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'libc/signal')
-rw-r--r--libc/signal/Makefile.in21
1 files changed, 8 insertions, 13 deletions
diff --git a/libc/signal/Makefile.in b/libc/signal/Makefile.in
index be9ddac..a29f697 100644
--- a/libc/signal/Makefile.in
+++ b/libc/signal/Makefile.in
@@ -7,33 +7,28 @@
subdirs += libc/signal
-CSRC := allocrtsig.c killpg.c raise.c sigaction.c sigaddset.c sigandset.c \
+CSRC-y := allocrtsig.c killpg.c raise.c sigaction.c sigaddset.c sigandset.c \
sigblock.c sigdelset.c sigempty.c sigfillset.c siggetmask.c \
sigisempty.c sigismem.c sigjmp.c signal.c \
sigorset.c sigpause.c sigsetmask.c sigsetops.c sigwait.c
-ifeq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),y)
-CSRC += sighold.c sigignore.c sigrelse.c sigset.c
-endif
-ifeq ($(UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL),y)
-CSRC += sysv_signal.c
-endif
-ifeq ($(UCLIBC_SUSV4_LEGACY),y)
-CSRC += sigintr.c
-endif
+CSRC-$(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL) += \
+ sighold.c sigignore.c sigrelse.c sigset.c
+CSRC-$(UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL) += sysv_signal.c
+CSRC-$(UCLIBC_SUSV4_LEGACY) += sigintr.c
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
CSRC:=$(filter-out raise.c sigaction.c,$(CSRC))
endif
ifneq ($(strip $(ARCH_OBJS)),)
-CSRC := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC))
+CSRC-y := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC-y))
endif
SIGNAL_DIR := $(top_srcdir)libc/signal
SIGNAL_OUT := $(top_builddir)libc/signal
-SIGNAL_SRC := $(patsubst %.c,$(SIGNAL_DIR)/%.c,$(CSRC))
-SIGNAL_OBJ := $(patsubst %.c,$(SIGNAL_OUT)/%.o,$(CSRC))
+SIGNAL_SRC := $(patsubst %.c,$(SIGNAL_DIR)/%.c,$(CSRC-y))
+SIGNAL_OBJ := $(patsubst %.c,$(SIGNAL_OUT)/%.o,$(CSRC-y))
libc-y += $(SIGNAL_OBJ)