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
|
$NetBSD: patch-aa,v 1.6 1998/08/07 10:40:26 agc Exp $
--- c++/Makefile.in.orig Wed Nov 26 13:39:11 1997
+++ c++/Makefile.in Wed Nov 26 13:39:59 1997
@@ -50,6 +50,8 @@
LINK = $(CXX)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@
+ABI_VERSION = @nc_cv_abi_version@
+
all: demo
OBJS_DEMO = \
--- test/Makefile.in.orig Sat Nov 16 22:05:54 1996
+++ test/Makefile.in Fri Jan 9 12:13:01 1998
@@ -39,7 +39,9 @@
CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H -I$(srcdir)
-CCFLAGS = $(CFLAGS) $(CPPFLAGS) $(CFLAGS_@DFT_UPR_MODEL@)
+CCFLAGS = $(CFLAGS) $(CPPFLAGS) $(CFLAGS_NORMAL)
+
+ABI_VERSION = @nc_cv_abi_version@
LOCAL_LIBS = @TEST_DEPS@
--- progs/Makefile.in.orig Sat Jun 15 21:40:53 1996
+++ progs/Makefile.in Fri Jan 9 12:41:20 1998
@@ -79,12 +79,12 @@
AUTO_SRC = \
termsort.c
-PROGS = tic toe infocmp clear tput tset
+PROGS = tic toe infocmp
TESTPROGS = mvcur tctest hardscroll hashmap
# Default library, for linking applications
-LIB_CURSES = ../lib/libncurses@DFT_DEP_SUFFIX@
+LIB_CURSES = -L../lib -lncurses
################################################################################
all: $(AUTO_SRC) $(PROGS)
@@ -98,15 +98,9 @@
$(INSTALL_PROGRAM) tic $(INSTALL_PREFIX)$(bindir)/tic
$(INSTALL_PROGRAM) toe $(INSTALL_PREFIX)$(bindir)/toe
$(INSTALL_PROGRAM) infocmp $(INSTALL_PREFIX)$(bindir)/infocmp
- $(INSTALL_PROGRAM) clear $(INSTALL_PREFIX)$(bindir)/clear
- $(INSTALL_PROGRAM) tput $(INSTALL_PREFIX)$(bindir)/tput
- $(INSTALL_PROGRAM) tset $(INSTALL_PREFIX)$(bindir)/tset
@echo "linking captoinfo to tic"
-@rm -f $(INSTALL_PREFIX)$(bindir)/captoinfo
-@ln $(INSTALL_PREFIX)$(bindir)/tic $(INSTALL_PREFIX)$(bindir)/captoinfo
- @echo "linking reset to tset"
- -@rm -f $(INSTALL_PREFIX)$(bindir)/reset
- -@ln $(INSTALL_PREFIX)$(bindir)/tset $(INSTALL_PREFIX)$(bindir)/reset
$(INSTALL_PREFIX)$(bindir) :
$(srcdir)/../mkinstalldirs $@
@@ -120,40 +114,40 @@
$(MODEL)/dump_entry.o \
$(LIB_CURSES)
tic: $(DEPS_TIC)
- @ECHO_LINK@ $(LINK) $(CFLAGS_DEFAULT) $(DEPS_TIC) $(LDFLAGS) -o $@
+ @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) $(DEPS_TIC) $(LDFLAGS) -o $@
DEPS_TOE = \
$(MODEL)/toe.o \
$(MODEL)/dump_entry.o \
$(LIB_CURSES)
toe: $(DEPS_TOE)
- @ECHO_LINK@ $(LINK) $(CFLAGS_DEFAULT) $(DEPS_TOE) $(LDFLAGS) -o $@
+ @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) $(DEPS_TOE) $(LDFLAGS) -o $@
DEPS_CLEAR = \
$(MODEL)/clear.o \
$(LIB_CURSES)
clear: $(DEPS_CLEAR)
- @ECHO_LINK@ $(LINK) $(CFLAGS_DEFAULT) $(DEPS_CLEAR) $(LDFLAGS) -o $@
+ @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) $(DEPS_CLEAR) $(LDFLAGS) -o $@
DEPS_TPUT = \
$(MODEL)/tput.o \
$(LIB_CURSES)
tput: $(DEPS_TPUT)
- @ECHO_LINK@ $(LINK) $(CFLAGS_DEFAULT) $(DEPS_TPUT) $(LDFLAGS) -o $@
+ @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) $(DEPS_TPUT) $(LDFLAGS) -o $@
DEPS_INFOCMP = \
$(MODEL)/infocmp.o \
$(MODEL)/dump_entry.o \
$(LIB_CURSES)
infocmp: $(DEPS_INFOCMP)
- @ECHO_LINK@ $(LINK) $(CFLAGS_DEFAULT) $(DEPS_INFOCMP) $(LDFLAGS) -o $@
+ @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) $(DEPS_INFOCMP) $(LDFLAGS) -o $@
DEPS_TSET = \
$(MODEL)/tset.o \
$(MODEL)/dump_entry.o \
$(LIB_CURSES)
tset: $(DEPS_TSET)
- @ECHO_LINK@ $(LINK) $(CFLAGS_DEFAULT) $(DEPS_TSET) $(LDFLAGS) -o $@
+ @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) $(DEPS_TSET) $(LDFLAGS) -o $@
termsort.c: $(srcdir)/MKtermsort.sh
sh -c "$(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/Caps" >$@
--- panel/Makefile.in 1998/03/06 22:13:13 1.1
+++ panel/Makefile.in 1998/03/06 22:13:29
@@ -35,7 +35,7 @@
THIS = Makefile
MODEL = @DFT_LWR_MODEL@
-INSTALL_PREFIX = @INSTALL_PREFIX
+INSTALL_PREFIX = @INSTALL_PREFIX@
srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
|
