1 files changed, 43 insertions, 11 deletions
diff --git a/libutil/Makefile.in b/libutil/Makefile.in
index 8c5846400..79c329a33 100644
--- a/libutil/Makefile.in
+++ b/libutil/Makefile.in
@@ -1,21 +1,53 @@
-# Makefile.in for uClibc
+# Makefile for uClibc
 #
-# Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details.
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+CFLAGS-libutil := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+
+LDFLAGS-libutil.so := $(LDFLAGS)
 
-CFLAGS+=$(SSP_ALL_CFLAGS)
+LIBS-libutil.so := $(LIBS)
 
-LIB_NAME:=libutil
+libutil_FULL_NAME := libutil-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
-srcdir=$(top_srcdir)$(LIB_NAME)
+libutil_DIR := $(top_srcdir)libutil
+libutil_OUT := $(top_builddir)libutil
 
-$(LIB_NAME)_SRC:=$(wildcard $(srcdir)/*.c)
+libutil_SRC := $(wildcard $(libutil_DIR)/*.c)
 ifneq ($(ARCH_HAS_MMU),y)
-$(LIB_NAME)_SRC:=$(filter-out $(srcdir)/forkpty.c,$($(LIB_NAME)_SRC))
+libutil_SRC := $(filter-out $(libutil_DIR)/forkpty.c,$(libutil_SRC))
 endif
+libutil_OBJ := $(patsubst $(libutil_DIR)/%.c,$(libutil_OUT)/%.o,$(libutil_SRC))
+
+libutil-a-y := $(libutil_OBJ)
+libutil-so-y := $(libutil_OBJ:.o=.os)
+
+libutil-multi-y := $(libutil_SRC)
 
-libso-y+=$(top_builddir)lib/$(LIB_NAME).so
-liba-y+=$(top_builddir)lib/$(LIB_NAME).a
-libclean-y+=$(LIB_NAME)_clean
+lib-a-y += $(top_builddir)lib/libutil.a
+lib-so-y += $(top_builddir)lib/libutil.so
+objclean-y += libutil_clean
+
+$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil_so.a libc-y
+	$(call link.so,$(libutil_FULL_NAME),$(MAJOR_VERSION))
+
+$(libutil_OUT)/libutil_so.a: $(libutil-so-y)
+	$(Q)$(RM) $@
+	$(do_strip)
+	$(do_ar)
+
+ifeq ($(DOPIC),y)
+$(top_builddir)lib/libutil.a: $(libutil-a-y:.o=.os)
+else
+$(top_builddir)lib/libutil.a: $(libutil-a-y)
+endif
+	$(Q)$(INSTALL) -d $(dir $@)
+	$(Q)$(RM) $@
+	$(do_strip)
+	$(do_ar)
 
-include $(top_srcdir)Makefile.libs
+libutil_clean:
+	$(RM) $(libutil_OUT)/*.{o,os,a}