Remove ar-target and shared targets, at build time now we traverse the tree only...

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

diff --git a/libcrypt/Makefile b/libcrypt/Makefile
index 8d72741..2b129a8 100644 (file)
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# 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
@@ -24,39 +24,40 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
-LIBCRYPT=libcrypt.a
-LIBCRYPT_SHARED=libcrypt.so
-LIBCRYPT_SHARED_FULLNAME=libcrypt-$(MAJOR_VERSION).$(MINOR_VERSION).so
+CFLAGS+=$(SSP_ALL_CFLAGS)
 
-CSRC = crypt.c des.c md5.c
-OBJS=$(patsubst %.c,%.o, $(CSRC))
+LIB_NAME=libcrypt
+AR_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).a
+SO_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).so
+SO_FULL_NAME=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
-all: $(OBJS) $(LIBCRYPT)
+CSRC = $(wildcard *.c)
 
-$(LIBCRYPT): ar-target
+OBJS=$(patsubst %.c,%.o, $(CSRC))
 
-ar-target: $(OBJS)
-       $(AR) $(ARFLAGS) $(LIBCRYPT) $(OBJS)
-       install -d $(TOPDIR)lib
-       rm -f $(TOPDIR)lib/$(LIBCRYPT)
-       install -m 644 $(LIBCRYPT) $(TOPDIR)lib
+ifeq ($(strip $(HAVE_SHARED)),y)
+all: $(SO_LIB_NAME)
+else
+all: $(AR_LIB_NAME)
+endif
+
+$(AR_LIB_NAME): $(OBJS)
+       $(INSTALL) -d $(TOPDIR)lib
+       $(RM) $(AR_LIB_NAME)
+       $(AR) $(ARFLAGS) $(AR_LIB_NAME) $(OBJS)
+
+$(SO_LIB_NAME): $(AR_LIB_NAME)
+       $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $(SO_LIB_NAME)
+       $(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
+               -o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $(AR_LIB_NAME) \
+               --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+               -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
+       $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
+       $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME)
 
 $(OBJS): %.o : %.c
-       $(TARGET_CC) $(TARGET_CFLAGS) -c $< -o $@
+       $(CC) $(CFLAGS) -c $< -o $@
        $(STRIPTOOL) -x -R .note -R .comment $*.o
 
-$(OBJ): Makefile
-
-shared: all
-       $(LD) $(LDFLAGS) -o $(LIBCRYPT_SHARED_FULLNAME) \
-               -soname=$(LIBCRYPT_SHARED).$(MAJOR_VERSION) \
-               --whole-archive $(LIBCRYPT);
-       install -d $(TOPDIR)lib
-       rm -f $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION)
-       install -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib;
-       (cd $(TOPDIR)lib && ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED)); 
-       (cd $(TOPDIR)lib && ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED).$(MAJOR_VERSION)); 
-
-clean: 
-       rm -f *.[oa] *~ core $(LIBCRYPT_SHARED)* $(LIBCRYPT_SHARED_FULLNAME)*
-
+clean:
+       $(RM) *.o *~ core