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
79
80
81
82
83
|
$NetBSD: patch-aa,v 1.2 2009/12/16 19:16:58 zafer Exp $
--- src/Makefile.in.orig 2009-12-05 20:03:51.000000000 +0100
+++ src/Makefile.in
@@ -4,7 +4,7 @@
#---------------------------------------------------------------------------
CC = @CC@
CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = $(EXECLIBS)
#-----------------------------------------------------------------------------
# System library that contains functions for dynamic linking (-ldl)
#-----------------------------------------------------------------------------
@@ -22,7 +22,7 @@ ELF_DEP_LIBS = @ELF_DEP_LIBS@
# 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
VERSION_SCRIPT = $(SRCDIR)/slang.ver
@@ -87,11 +87,11 @@ INSTALL_ELFLIB_TARGET = @INSTALL_ELFLIB_
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 --tag=CC $(LIBTOOL_FLAGS) $(CC) -c $(ALL_CFLAGS) $(LIBTOOL_CFLAGS)
ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS)
ELF_LINK_CMD = $(ELF_LINK)
-NORMAL_LIB = lib$(THIS_LIB).a
+NORMAL_LIB = lib$(THIS_LIB)2.la
OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
# On most systems, these variables have values of the form:
@@ -138,14 +138,14 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
#---------------------------------------------------------------------------
# Rules
#---------------------------------------------------------------------------
-all: static elf
-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)
+elf: all
$(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 $(LIBTOOL_FLAGS) \
+ $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
+ $(LIBTOOL_LDFLAGS) -rpath $(PREFIX)/lib \
+ $(DL_LIB) -lm -ltermcap -version-info 2:1
@echo ""
@echo $(NORMAL_LIB) created in $(OBJDIR)
@@ -186,10 +186,9 @@ install-docs: $(DEST_DOCDIR)
echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
$(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
done
-install-static: static install-headers install-docs $(DEST_LIBDIR)
+install-static: all install-headers install-docs $(DEST_LIBDIR)
@echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)/
- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)/
- $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)/
install-elf-and-links:
-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
@@ -207,9 +206,9 @@ install-elf-cygwin:
$(INSTALL_DATA) $(ELFDIR_DLL_LIB) $(DEST_LIBDIR)/
$(MKINSDIR) $(DEST_BINDIR)
$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_BINDIR)/
-install-elf: elf install-headers install-docs $(DEST_LIBDIR) $(INSTALL_ELFLIB_TARGET)
-install-all: install-elf install-static
-install: install-all
+install-elf: install-static
+install-all: install-static
+install: install-static
#---------------------------------------------------------------------------
# Tests
#---------------------------------------------------------------------------
|
