diff options
| -rw-r--r-- | libcrypt/Makefile.in | 14 | ||||
| -rw-r--r-- | libutil/Makefile.in | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index 7c8b4589f..7ff27ae8b 100644 --- a/libcrypt/Makefile.in +++ b/libcrypt/Makefile.in @@ -1,7 +1,7 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# 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. # @@ -33,18 +33,28 @@ lib-a-y += $(top_builddir)lib/libcrypt.a lib-so-y += $(top_builddir)lib/libcrypt.so objclean-y += libcrypt_clean +ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) $(top_builddir)lib/libcrypt.so: $(top_builddir)lib/libcrypt.a $(libc) else $(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt_so.a $(libc) endif $(call link.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION)) +else +$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.oS $(libc) + $(call linkm.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION)) +endif $(libcrypt_OUT)/libcrypt_so.a: $(libcrypt-so-y) $(Q)$(RM) $@ $(do_strip) $(do_ar) +$(libcrypt_OUT)/libcrypt.oS: $(libcrypt_SRC) + $(Q)$(RM) $@ + $(compile-m) + $(Q)$(STRIPTOOL) $(STRIP_FLAGS) $@ + $(top_builddir)lib/libcrypt.a: $(libcrypt-a-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ @@ -52,4 +62,4 @@ $(top_builddir)lib/libcrypt.a: $(libcrypt-a-y) $(do_ar) libcrypt_clean: - $(RM) $(libcrypt_OUT)/*.{o,os,a} + $(RM) $(libcrypt_OUT)/*.{o,os,oS,a} diff --git a/libutil/Makefile.in b/libutil/Makefile.in index bc6943aeb..6569e87ae 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. # @@ -35,18 +35,28 @@ 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) + $(Q)$(STRIPTOOL) $(STRIP_FLAGS) $@ + $(top_builddir)lib/libutil.a: $(libutil-a-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ @@ -54,4 +64,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} |