Peter Kjellerstedt writes:

[uclinux-h8/uClibc.git] / libcrypt / Makefile

diff --git a/libcrypt/Makefile b/libcrypt/Makefile
index 78deb14..aae3b03 100644 (file)
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -1,6 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
+# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -22,36 +23,40 @@
 
 TOPDIR=../
 include $(TOPDIR)Rules.mak
+
 LIBCRYPT=libcrypt.a
-SHARED_NAME=libcrypt.so.1
-APP_CC= ../extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc
+LIBCRYPT_SHARED=libcrypt.so
+LIBCRYPT_SHARED_FULLNAME=libcrypt-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
 CSRC = crypt.c des.c md5.c
-COBJS=$(patsubst %.c,%.o, $(CSRC))
-
-
-OBJS=$(COBJS)
+OBJS=$(patsubst %.c,%.o, $(CSRC))
 
-all: $(OBJS) $(LIBCRYPT) shared
+all: $(OBJS) $(LIBCRYPT)
 
 $(LIBCRYPT): ar-target
 
 ar-target: $(OBJS)
        $(AR) $(ARFLAGS) $(LIBCRYPT) $(OBJS)
+       $(INSTALL) -d $(TOPDIR)lib
+       $(RM) $(TOPDIR)lib/$(LIBCRYPT)
+       $(INSTALL) -m 644 $(LIBCRYPT) $(TOPDIR)lib
 
-$(COBJS): %.o : %.c
-       $(APP_CC) $(CFLAGS) -c $< -o $@
+$(OBJS): %.o : %.c
+       $(CC) $(CFLAGS) -c $< -o $@
        $(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(OBJ): Makefile
 
-shared: $(LIBCRYPT)
-       $(APP_CC) $(LDFLAGS) -shared -o $(SHARED_NAME) \
-           -Wl,-soname,$(SHARED_NAME) $(COBJS) $(TOPDIR)libuClibc.so.1
+shared: all
+       $(LD) $(LDFLAGS) -soname=$(LIBCRYPT_SHARED).$(MAJOR_VERSION) \
+               -o $(LIBCRYPT_SHARED_FULLNAME) --whole-archive $(LIBCRYPT) \
+               --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
+               -L$(TOPDIR)/lib -lc;
+       $(INSTALL) -d $(TOPDIR)lib
+       $(RM) $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION)
+       $(INSTALL) -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib;
+       $(LN) -sf $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED)
+       $(LN) -sf $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION)
 
 clean: 
-       rm -f *.[oa] *~ core $(SHARED_NAME)
-
-.PHONY: dummy
-
-
+       $(RM) *.[oa] *~ core $(LIBCRYPT_SHARED)* $(LIBCRYPT_SHARED_FULLNAME)*