aboutsummaryrefslogtreecommitdiff
path: root/librt
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-06-17 18:40:14 +0200
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-06-17 18:40:14 +0200
commit729293867378c80b4e534a7ff3d68ac936f03824 (patch)
tree0fad768210d804adaecd0132c59b1de0e10e095b /librt
parent83b76076b82adbac62df5e093ad3a552347b5416 (diff)
downloaduClibc-729293867378c80b4e534a7ff3d68ac936f03824.tar.gz
uClibc-729293867378c80b4e534a7ff3d68ac936f03824.tar.bz2
librt: simplify handling LDFLAGS
plus a few cosmetic touch-ups Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'librt')
-rw-r--r--librt/Makefile.in15
1 files changed, 6 insertions, 9 deletions
diff --git a/librt/Makefile.in b/librt/Makefile.in
index e4269b4e6..d490af509 100644
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@@ -9,11 +9,9 @@ subdirs += librt
CFLAGS-librt := -DNOT_IN_libc -DIS_IN_librt $(SSP_ALL_CFLAGS)
-ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-LDFLAGS-librt.so := $(LDFLAGS) $(top_builddir)lib/libdl.so \
- $(top_builddir)lib/libpthread.so
-else
LDFLAGS-librt.so := $(LDFLAGS)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+LDFLAGS-librt.so += $(top_builddir)lib/libdl.so $(top_builddir)lib/libpthread.so
endif
LIBS-librt.so := $(LIBS)
@@ -26,14 +24,14 @@ librt_OUT := $(top_builddir)librt
ifeq ($(UCLIBC_HAS_REALTIME),y)
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
librt_CSRC := $(filter-out mq_notify.c timer_create.c timer_delete.c \
- timer_getoverr.c timer_gettime.c timer_settime.c, \
- $(notdir $(wildcard $(librt_DIR)/*.c)))
+ timer_getoverr.c timer_gettime.c timer_settime.c, \
+ $(notdir $(wildcard $(librt_DIR)/*.c)))
librt_SSRC := $(wildcard $(librt_DIR)/*.S)
librt_OBJ := $(patsubst %.c,$(librt_OUT)/%.o,$(librt_CSRC))
librt_OBJ += $(patsubst $(librt_DIR)/%.S,$(librt_OUT)/%.o,$(librt_SSRC))
else
librt_SRC := $(filter-out clock_nanosleep.c clock_getcpuclockid.c clock_gettime.c, \
- $(notdir $(wildcard $(librt_DIR)/*.c)))
+ $(notdir $(wildcard $(librt_DIR)/*.c)))
librt_OBJ := $(patsubst %.c,$(librt_OUT)/%.o,$(librt_SRC))
endif
@@ -63,8 +61,7 @@ $(librt_OUT)/librt_so.a: $(librt-so-y)
$(Q)$(RM) $@
$(do_ar)
-$(top_builddir)lib/librt.a: $(librt-a-y)
- $(Q)$(INSTALL) -d $(dir $@)
+$(top_builddir)lib/librt.a: $(librt-a-y) | $(top_builddir)lib
$(Q)$(RM) $@
$(do_ar)