Be more careful when using libtool: use $(CC) not cc as this may not be

the c compiler.
This commit is contained in:
skrll 2001-04-23 14:52:51 +00:00
parent 4931399076
commit bc4b8d44d2
2 changed files with 14 additions and 12 deletions

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.2 2001/04/21 00:44:29 wiz Exp $
$NetBSD: distinfo,v 1.3 2001/04/23 14:52:51 skrll Exp $
SHA1 (slang-1.4.4.tar.gz) = 4b6421929053edabee56d64b42ab46f25ae7e49b
Size (slang-1.4.4.tar.gz) = 749227 bytes
SHA1 (patch-aa) = 002d7fddcfa067cbfebdf92a80a682633c2f4625
SHA1 (patch-aa) = 91393d0d86ca046cf3c3fe179f34785e30a9ab96
SHA1 (patch-ac) = 6b7c1a1aa90899af42e8df9c72c88e5bdb2111a9

View file

@ -1,13 +1,10 @@
$NetBSD: patch-aa,v 1.13 2001/02/05 17:30:09 fredb Exp $
$NetBSD: patch-aa,v 1.14 2001/04/23 14:52:53 skrll Exp $
--- src/Makefile.in.orig Sat Feb 3 15:08:25 2001
+++ src/Makefile.in Sat Feb 3 22:18:17 2001
@@ -2,9 +2,9 @@
--- src/Makefile.in.orig Wed Feb 21 02:17:35 2001
+++ src/Makefile.in
@@ -4,7 +4,7 @@
#---------------------------------------------------------------------------
# ANSI C compiler
#---------------------------------------------------------------------------
-CC = @CC@
+CC = $(LIBTOOL) @CC@
CC = @CC@
CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
+LDFLAGS = $(EXECLIBS)
@ -32,7 +29,12 @@ $NetBSD: patch-aa,v 1.13 2001/02/05 17:30:09 fredb Exp $
DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
MODULE_INSTALL_DIR = @libdir@/slang/modules
#---------------------------------------------------------------------------
@@ -78,7 +78,7 @@
@@ -74,11 +74,11 @@
CONFIG_H = config.h
ALL_CFLAGS = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
ALL_ELF_CFLAGS = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
-COMPILE_CMD = $(CC) -c $(ALL_CFLAGS)
+COMPILE_CMD = $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS)
ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS)
ELF_LINK_CMD = @ELF_LINK_CMD@
@ -62,7 +64,7 @@ $NetBSD: patch-aa,v 1.13 2001/02/05 17:30:09 fredb Exp $
- -$(RM) $(OBJDIR_NORMAL_LIB)
- cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
- $(RANLIB) $(OBJDIR_NORMAL_LIB)
+ cd $(OBJDIR); $(LIBTOOL) --mode=link cc -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
+ cd $(OBJDIR); $(LIBTOOL) --mode=link $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
+ -rpath $(PREFIX)/lib -lm -ltermcap -version-info 1:4
@echo ""
@echo $(NORMAL_LIB) created in $(OBJDIR)