librt: simplify handling LDFLAGS

plus a few cosmetic touch-ups

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

diff --git a/librt/Makefile.in b/librt/Makefile.in
index e4269b4..d490af5 100644 (file)
--- 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)