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
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
$NetBSD: patch-ab,v 1.2 2016/10/10 02:12:57 mef Exp $
--- x11/Makefile.in.orig 2008-07-13 17:08:22.000000000 +0900
+++ x11/Makefile.in 2016-10-10 10:39:28.000000000 +0900
@@ -5,6 +5,10 @@ THIS = Makefile
@SET_MAKE@
+prefix =@prefix@
+exec_prefix =$(DESTDIR)@exec_prefix@
+libdir =$(exec_prefix)/lib
+
PDCURSES_SRCDIR = ..
osdir = .
@@ -27,16 +31,18 @@ CFLAGS = @CFLAGS@
CPPFLAGS = @DEFS@ -DXCURSES @SYS_DEFS@ -I$(PDCURSES_SRCDIR)
-BUILD = @CC@ -c $(CFLAGS) $(CPPFLAGS) @MH_XINC_DIR@
+BUILD = $(LIBTOOL) --mode=compile $(O_BUILD)
+O_BUILD = @CC@ -c $(CFLAGS) $(CPPFLAGS) @MH_XINC_DIR@
DYN_BUILD = @O2SAVE@ $(BUILD) @DYN_COMP@ @CC2O@
-LINK = @PURIFY@ @CC@
+LINK = $(LIBTOOL) --mode=link @CC@
#LDFLAGS = $(LIB_DEPS) @LDFLAGS@ @LIBS@ @MH_XLIBS@ @MH_EXTRA_LIBS@
-LDFLAGS = $(LIBCURSES) @LDFLAGS@ @LIBS@ @MH_XLIBS@ @MH_EXTRA_LIBS@
+LTLDFLAGS = @LDFLAGS@ @LIBS@ @MH_XLIBS@ @MH_EXTRA_LIBS@
+LDFLAGS = $(LIBCURSES) $(LTLDFLAGS)
RANLIB = @RANLIB@
-LIBCURSES = libXCurses.a
+LIBCURSES = libXCurses.la
LIB_DEPS = -L$(PDCURSES_SRCDIR)/x11 -lXCurses
@@ -48,7 +54,7 @@ tuidemo.o worm.o xmas.o
SHLFILE = XCurses
-all: $(PDCLIBS) $(DEMOS)
+all: $(LIBCURSES) $(DEMOS)
install:
echo Does nothing at the moment
@@ -81,8 +87,8 @@ PDCSHOBJS = $(PDCOBJS:.o=.sho)
SHOFILES = $(LIBSHOBJS) $(PDCSHOBJS)
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
- ar rv $@ $?
- -$(RANLIB) $@
+ $(LIBTOOL) --mode=link $(CC) -o $@ -rpath $(libdir) $(LTLDFLAGS) \
+ $(LIBOBJS:.o=.lo) $(PDCOBJS:.o=.lo)
$(SHLPRE)$(SHLFILE)$(SHLPST) : $(SHOFILES)
$(LD_RXLIB1) -o $@ $(SHOFILES) $(LD_RXLIB2)
@@ -489,31 +495,31 @@ xmas: xmas.o
$(LINK) xmas.o -o $@ $(LDFLAGS)
firework.o: $(demodir)/firework.c
- $(BUILD) $(demodir)/firework.c
+ $(O_BUILD) $(demodir)/firework.c
newdemo.o: $(demodir)/newdemo.c
- $(BUILD) $(demodir)/newdemo.c
+ $(O_BUILD) $(demodir)/newdemo.c
ptest.o: $(demodir)/ptest.c $(PDCURSES_SRCDIR)/panel.h
- $(BUILD) $(demodir)/ptest.c
+ $(O_BUILD) $(demodir)/ptest.c
rain.o: $(demodir)/rain.c
- $(BUILD) $(demodir)/rain.c
+ $(O_BUILD) $(demodir)/rain.c
testcurs.o: $(demodir)/testcurs.c
- $(BUILD) $(demodir)/testcurs.c
+ $(O_BUILD) $(demodir)/testcurs.c
tui.o: $(demodir)/tui.c $(demodir)/tui.h
- $(BUILD) $(demodir)/tui.c
+ $(O_BUILD) $(demodir)/tui.c
tuidemo.o: $(demodir)/tuidemo.c
- $(BUILD) $(demodir)/tuidemo.c
+ $(O_BUILD) $(demodir)/tuidemo.c
worm.o: $(demodir)/worm.c
- $(BUILD) $(demodir)/worm.c
+ $(O_BUILD) $(demodir)/worm.c
xmas.o: $(demodir)/xmas.c
- $(BUILD) $(demodir)/xmas.c
+ $(O_BUILD) $(demodir)/xmas.c
# This section provides for compiling and linking the
# ncurses test programs.
@@ -551,22 +557,22 @@ ncurses: ncurses.o $(LIBCURSES)
$(LINK) ncurses.o -o $@ $(LDFLAGS)
bs.o: $(ncurses_testdir)/bs.c $(PDCURSES_CURSES_H)
- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/bs.c
+ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/bs.c
gdc.o: $(ncurses_testdir)/gdc.c $(PDCURSES_CURSES_H)
- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/gdc.c
+ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/gdc.c
hanoi.o: $(ncurses_testdir)/hanoi.c $(PDCURSES_CURSES_H)
- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/hanoi.c
+ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/hanoi.c
knight.o: $(ncurses_testdir)/knight.c $(PDCURSES_CURSES_H)
- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/knight.c
+ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/knight.c
tclock.o: $(ncurses_testdir)/tclock.c $(PDCURSES_CURSES_H)
- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/tclock.c
+ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/tclock.c
view.o: $(ncurses_testdir)/view.c $(PDCURSES_CURSES_H)
- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/view.c
+ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/view.c
ncurses.o: $(ncurses_testdir)/ncurses.c $(PDCURSES_CURSES_H)
- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/ncurses.c
+ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/ncurses.c
|
