summaryrefslogtreecommitdiff
path: root/devel/libslang/patches/patch-aa
blob: f24fd432797376890db782a5352f26a315015406 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
$NetBSD: patch-aa,v 1.8 1999/06/17 22:57:24 mjl Exp $

--- src/Makefile.in.orig	Mon Jun  7 01:35:06 1999
+++ src/Makefile.in	Thu Jun 17 00:51:43 1999
@@ -2,9 +2,9 @@
 #---------------------------------------------------------------------------
 # ANSI C compiler
 #---------------------------------------------------------------------------
-CC              = @CC@
+CC              = $(LIBTOOL) @CC@
 CFLAGS 		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
+LDFLAGS		= $(EXECLIBS)
 #-----------------------------------------------------------------------------
 # System library that contains functions for dynamic linking (-ldl)
 #-----------------------------------------------------------------------------
@@ -22,7 +22,7 @@
 # Set these values to ABSOLUTE path names
 #---------------------------------------------------------------------------
 SRCDIR = @SRCDIR@# Location of sources
-OBJDIR = @OBJDIR@# Location of objects
+OBJDIR = .# Location of objects
 ELFDIR = @ELFDIR@# Location of elf objects
 
 #---------------------------------------------------------------------------
@@ -62,13 +62,13 @@
 ELF_MINOR_VERSION	= @slang_minor_version@#
 
 CONFIG_H		= config.h
-ALL_CFLAGS		= $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
+ALL_CFLAGS		= -Dunix $(CFLAGS) $(THIS_LIB_DEFINES)
 ALL_ELF_CFLAGS		= $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
 COMPILE_CMD		= $(CC) -c $(ALL_CFLAGS)
 ELFCOMPILE_CMD		= $(ELF_CC) -c $(ALL_ELF_CFLAGS)
 ELF_LINK_CMD		= @ELF_LINK_CMD@
 
-NORMAL_LIB = lib$(THIS_LIB).a
+NORMAL_LIB = lib$(THIS_LIB).la
 OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
 
 ELFLIB = lib$(THIS_LIB).so#
@@ -77,7 +77,7 @@
 
 ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
 
-EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB) $(DL_LIB)
+EXECLIBS = libslang.la $(TCAPLIB)
 EXECDEPS = $(OBJDIR_NORMAL_LIB)
 
 OFILES = @PROGRAM_OFILES@
@@ -92,13 +92,13 @@
 #---------------------------------------------------------------------------
 # Rules
 #---------------------------------------------------------------------------
-all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)
 elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
 
 $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
 	-$(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) \
+		-rpath $(PREFIX)/lib -version-info 1:3
 	@echo ""
 	@echo $(NORMAL_LIB) created in $(OBJDIR)
 
@@ -122,9 +122,7 @@
 #---------------------------------------------------------------------------
 install: $(install_lib_dir) $(install_include_dir) $(OBJDIR_NORMAL_LIB)
 	@echo installing $(OBJDIR_NORMAL_LIB) in $(install_lib_dir)
-	$(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
-	$(RANLIB) $(install_lib_dir)/$(NORMAL_LIB)
-	chmod 644 $(install_lib_dir)/$(NORMAL_LIB)
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
 	@echo installing slang.h and slcurses.h in $(install_include_dir)
 	$(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir)
 	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir)