diff options
Diffstat (limited to 'libutil/Makefile.in')
| -rw-r--r-- | libutil/Makefile.in | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/libutil/Makefile.in b/libutil/Makefile.in index bc6943aeb..b42763d21 100644 --- a/libutil/Makefile.in +++ b/libutil/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -17,7 +17,7 @@ libutil_DIR := $(top_srcdir)libutil libutil_OUT := $(top_builddir)libutil libutil_SRC := $(wildcard $(libutil_DIR)/*.c) -ifneq ($(ARCH_HAS_MMU),y) +ifneq ($(ARCH_USE_MMU),y) libutil_SRC := $(filter-out $(libutil_DIR)/forkpty.c,$(libutil_SRC)) endif libutil_OBJ := $(patsubst $(libutil_DIR)/%.c,$(libutil_OUT)/%.o,$(libutil_SRC)) @@ -29,24 +29,32 @@ libutil-a-y := $(libutil_OBJ) endif libutil-so-y := $(libutil_OBJ:.o=.os) -libutil-multi-y := $(libutil_SRC) - lib-a-y += $(top_builddir)lib/libutil.a lib-so-y += $(top_builddir)lib/libutil.so objclean-y += libutil_clean +ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) $(top_builddir)lib/libutil.so: $(top_builddir)lib/libutil.a $(libc) else $(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil_so.a $(libc) endif $(call link.so,$(libutil_FULL_NAME),$(MAJOR_VERSION)) +else +$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil.oS | $(libc) + $(call linkm.so,$(libutil_FULL_NAME),$(MAJOR_VERSION)) +endif $(libutil_OUT)/libutil_so.a: $(libutil-so-y) $(Q)$(RM) $@ $(do_strip) $(do_ar) +$(libutil_OUT)/libutil.oS: $(libutil_SRC) + $(Q)$(RM) $@ + $(compile-m) + $(do_t_strip) + $(top_builddir)lib/libutil.a: $(libutil-a-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ @@ -54,4 +62,4 @@ $(top_builddir)lib/libutil.a: $(libutil-a-y) $(do_ar) libutil_clean: - $(RM) $(libutil_OUT)/*.{o,os,a} + $(RM) $(libutil_OUT)/*.{o,os,oS,a} |