summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-02-12 12:43:15 +0000
committerEric Andersen <andersen@codepoet.org>2003-02-12 12:43:15 +0000
commit289395d555e0a4d584639c3e972a23dd1cc68e06 (patch)
tree3f9d53aeda486334abff649ef13f197c066c5ddd /make
parentde8577632e731d83941ca66cc6df915443732328 (diff)
downloadbuildroot-novena-289395d555e0a4d584639c3e972a23dd1cc68e06.tar.gz
buildroot-novena-289395d555e0a4d584639c3e972a23dd1cc68e06.zip
Fix dependancies
Diffstat (limited to 'make')
-rw-r--r--make/ncurses.mk12
-rw-r--r--make/openssl.mk2
-rw-r--r--make/zlib.mk2
3 files changed, 8 insertions, 8 deletions
diff --git a/make/ncurses.mk b/make/ncurses.mk
index 7ff8f73c7..4c91fc5c9 100644
--- a/make/ncurses.mk
+++ b/make/ncurses.mk
@@ -5,7 +5,7 @@
#
#############################################################
# Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
-# $Id: ncurses.mk,v 1.21 2003/02/12 08:10:38 andersen Exp $
+# $Id: ncurses.mk,v 1.22 2003/02/12 12:43:15 andersen Exp $
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU Library General Public License as
@@ -61,11 +61,11 @@ $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.dist
);
touch $(NCURSES_DIR)/.configured
-$(NCURSES_DIR)/lib/libncurses.so: $(NCURSES_DIR)/.configured
+$(NCURSES_DIR)/lib/libncurses.so.5.2: $(NCURSES_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR)
-$(STAGING_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so
+$(STAGING_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.5.2
BUILD_CC=$(HOSTCC) \
HOSTCC=$(HOSTCC) CC=$(TARGET_CC) $(MAKE) \
prefix=$(STAGING_DIR) \
@@ -86,7 +86,7 @@ $(STAGING_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so
chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
touch -c $(STAGING_DIR)/lib/libncurses.a
-$(TARGET_DIR)/lib/libncurses.so: $(STAGING_DIR)/lib/libncurses.a
+$(TARGET_DIR)/lib/libncurses.so.5.2: $(STAGING_DIR)/lib/libncurses.a
cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
-cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/
mkdir -p $(TARGET_DIR)/usr/share/terminfo
@@ -94,7 +94,7 @@ $(TARGET_DIR)/lib/libncurses.so: $(STAGING_DIR)/lib/libncurses.a
cp -dpf $(STAGING_DIR)/usr/share/terminfo/$${i} $(TARGET_DIR)/usr/share/terminfo/; \
done
-$(TARGET_DIR)/usr/lib/libncurses.a: $(TARGET_DIR)/lib/libncurses.so
+$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/ncurses.h
cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
@@ -120,5 +120,5 @@ ncurses-clean:
ncurses-dirclean:
rm -rf $(NCURSES_DIR)
-ncurses: $(TARGET_DIR)/lib/libncurses.so
+ncurses: $(TARGET_DIR)/lib/libncurses.so.5.2
diff --git a/make/openssl.mk b/make/openssl.mk
index 9dc5e34dc..5bb67fca6 100644
--- a/make/openssl.mk
+++ b/make/openssl.mk
@@ -45,7 +45,7 @@ $(TARGET_DIR)/lib/libcrypto.so.0: $(STAGING_DIR)/lib/libcrypto.so.0
cp -fa $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/
#cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/
-$(TARGET_DIR)/usr/lib/libssl.a: $(TARGET_DIR)/lib/libcrypto.so.0
+$(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/lib/libcrypto.so.0
mkdir -p $(TARGET_DIR)/usr/include
cp -a $(STAGING_DIR)/include/openssl $(TARGET_DIR)/usr/include/
cp -dpf $(STAGING_DIR)/lib/libssl.a $(TARGET_DIR)/usr/lib/
diff --git a/make/zlib.mk b/make/zlib.mk
index ce48f4b52..c5de67f38 100644
--- a/make/zlib.mk
+++ b/make/zlib.mk
@@ -50,7 +50,7 @@ $(TARGET_DIR)/lib/libz.so.1.1.4: $(STAGING_DIR)/lib/libz.so.1.1.4
-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libz.so*
touch -c $(TARGET_DIR)/lib/libz.so.1.1.4
-$(TARGET_DIR)/usr/lib/libz.a: $(TARGET_DIR)/lib/libz.so.1.1.4
+$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/lib/libz.so.1.1.4
mkdir -p $(TARGET_DIR)/usr/include
cp -dpf $(STAGING_DIR)/include/zlib.h $(TARGET_DIR)/usr/include/
cp -dpf $(STAGING_DIR)/include/zconf.h $(TARGET_DIR)/usr/include/