- less verbose make clean

[uclinux-h8/uClibc.git] / libresolv / Makefile.in

diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in
index d94a076..f006fe1 100644 (file)
--- a/libresolv/Makefile.in
+++ b/libresolv/Makefile.in
@@ -1,17 +1,17 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-libresolv := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-libresolv := -DNOT_IN_libc -DIS_IN_libresolv $(SSP_ALL_CFLAGS)
 
 LDFLAGS-libresolv.so := $(LDFLAGS)
 
 LIBS-libresolv.so := $(LIBS)
 
-libresolv_FULL_NAME := libresolv-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libresolv_FULL_NAME := libresolv-$(VERSION).so
 
 libresolv_DIR := $(top_srcdir)libresolv
 libresolv_OUT := $(top_builddir)libresolv
@@ -19,32 +19,32 @@ libresolv_OUT := $(top_builddir)libresolv
 libresolv_SRC := $(libresolv_DIR)/resolv.c
 libresolv_OBJ := $(patsubst $(libresolv_DIR)/%.c,$(libresolv_OUT)/%.o,$(libresolv_SRC))
 
+ifeq ($(DOPIC),y)
+libresolv-a-y := $(libresolv_OBJ:.o=.os)
+else
 libresolv-a-y := $(libresolv_OBJ)
+endif
 libresolv-so-y := $(libresolv_OBJ:.o=.os)
 
-libresolv-multi-y := $(libresolv_SRC)
-
 lib-a-y += $(top_builddir)lib/libresolv.a
 lib-so-y += $(top_builddir)lib/libresolv.so
 objclean-y += libresolv_clean
 
-$(top_builddir)lib/libresolv.so: $(libresolv_OUT)/libresolv_so.a libc-y
+ifeq ($(DOPIC),y)
+$(top_builddir)lib/libresolv.so: $(top_builddir)lib/libresolv.a $(libc.depend)
+else
+$(top_builddir)lib/libresolv.so: $(libresolv_OUT)/libresolv_so.a $(libc.depend)
+endif
        $(call link.so,$(libresolv_FULL_NAME),$(MAJOR_VERSION))
 
 $(libresolv_OUT)/libresolv_so.a: $(libresolv-so-y)
        $(Q)$(RM) $@
-       $(do_strip)
        $(do_ar)
 
-ifeq ($(DOPIC),y)
-$(top_builddir)lib/libresolv.a: $(libresolv-a-y:.o=.os)
-else
 $(top_builddir)lib/libresolv.a: $(libresolv-a-y)
-endif
        $(Q)$(INSTALL) -d $(dir $@)
        $(Q)$(RM) $@
-       $(do_strip)
        $(do_ar)
 
 libresolv_clean:
-       $(RM) $(libresolv_OUT)/*.{o,os,a}
+       $(do_rm) $(addprefix $(libresolv_OUT)/*., o os a)