summaryrefslogtreecommitdiff
path: root/libcrypt
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-05-12 06:19:18 +0000
committerEric Andersen <andersen@codepoet.org>2001-05-12 06:19:18 +0000
commitf0da4aa1d854ca9c2a0e652dcb1d81bbf4d971f4 (patch)
tree39dd87100094d48dbc7e8557f26d5c02d331606f /libcrypt
parent249cb00d9f655778aa8a4519ee3e610a904d694d (diff)
Ok, this should finish off my massive ro-organization. The source
tree is less messy now (which helps), all libraries are placed into uClibc/lib when compiling, all libraries now use a consistant mechanism for being built, all libraries use a consistant naming scheme where the lib name includes the uClibc version number, which makes ldconfig happy and willing to work with us. -Erik
Diffstat (limited to 'libcrypt')
-rw-r--r--libcrypt/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/libcrypt/Makefile b/libcrypt/Makefile
index a3cff4fc6..6eac3299a 100644
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -39,7 +39,7 @@ ar-target: $(OBJS)
$(AR) $(ARFLAGS) $(LIBCRYPT) $(OBJS)
install -d $(TOPDIR)lib
rm -f $(TOPDIR)lib/$(LIBCRYPT)
- install -m 644 $(LIBCRYPT) $(TOPDIR)lib/
+ install -m 644 $(LIBCRYPT) $(TOPDIR)lib
$(OBJS): %.o : %.c
$(TARGET_CC) $(CFLAGS) -c $< -o $@
@@ -49,10 +49,11 @@ $(OBJ): Makefile
shared: all
$(TARGET_CC) $(LDFLAGS) -shared -o $(LIBCRYPT_SHARED_FULLNAME) \
- -Wl,-soname,$(LIBCRYPT_SHARED).$(MAJOR_VERSION) $(OBJS) $(TOPDIR)$(SHARED_FULLNAME)
+ -Wl,-soname,$(LIBCRYPT_SHARED).$(MAJOR_VERSION) -Wl,--whole-archive \
+ $(LIBCRYPT) $(TOPDIR)lib/$(SHARED_FULLNAME)
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/;
+ install -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib;
(cd $(TOPDIR)lib; ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED).$(MAJOR_VERSION));
clean: