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
130
131
132
133
134
135
|
$NetBSD: patch-aa,v 1.6 2002/04/17 18:58:52 briggs Exp $
--- Makefile.orig Thu Aug 26 08:08:51 1999
+++ Makefile Wed Apr 17 14:55:31 2002
@@ -8,11 +8,11 @@
# Compilation/installation vars (global for all following sections) |
#=====================================================================
#
-PREFIX = /usr/local
-X11PREFIX = /usr/X11R6
-INCX11 = $(X11PREFIX)/include
-LIBX11 = $(X11PREFIX)/lib
-INCFORMS = $(X11PREFIX)/include
+#PREFIX = /usr/local
+#X11PREFIX = /usr/X11R6
+INCX11 = $(X11BASE)/include
+LIBX11 = $(X11BASE)/lib
+INCFORMS = $(X11PREFIX)/include/X11
LIBFORMS = $(X11PREFIX)/lib
MODEM_DEV = modem
MODEM_PATH = /dev/$(MODEM_DEV)
@@ -24,25 +24,25 @@
# Normal (i.e. SuSE-6.x) vars; for SuSE-5.x use the lines which
# DO NOT include -lcrypt in EXTRALIBS and -DGLIBC2 in EXTRADEFS.
#----------------------------------------------------------------
-BINX11 = $(X11PREFIX)/bin
-USRLOCAL = $(PREFIX)/bin
-SBINDIR = /usr/sbin
-VARRUN = /var/run
-USRLIBPPP = /etc/ppp
-OPTSDIR = /etc/ppp
-MANDIR = $(X11PREFIX)/man/man1
-ETCPPP = /etc/ppp
-INSTPPPDIR = $(ETCPPP)
-DESTDIR =
-GROUP = uucp
-GCCFLAGS = -Wall -O
-EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2
+#BINX11 = $(X11PREFIX)/bin
+#USRLOCAL = $(PREFIX)/bin
+#SBINDIR = /usr/sbin
+#VARRUN = /var/run
+#USRLIBPPP = /etc/ppp
+#OPTSDIR = /etc/ppp
+#MANDIR = $(X11PREFIX)/man/man1
+#ETCPPP = /etc/ppp
+#INSTPPPDIR = $(ETCPPP)
+#DESTDIR =
+#GROUP = uucp
+#GCCFLAGS = -Wall -O
+#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2
#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\"
-EXTRALIBS = -lcrypt
+#EXTRALIBS = -lcrypt
#EXTRALIBS =
-LINKX11 =
-LINKFORMS = -L$(LIBFORMS) -lforms
-INSTALL = install
+#LINKX11 =
+#LINKFORMS = -L$(LIBFORMS) -lforms
+#INSTALL = install
#
# Debian vars (if your Debian distribution is relatively
# old and does not use glibc2, use the lines which DO NOT
@@ -166,24 +166,24 @@
#
# NetBSD vars
#-------------
-#BINX11 = $(X11PREFIX)/bin
-#USRLOCAL = $(BINX11)
-#SBINDIR = /usr/sbin
-#VARRUN = /var/run
-#USRLIBPPP = $(PREFIX)/libexec
-#MANDIR = $(PREFIX)/man/man1
-#ETCPPP = /etc/ppp
-#OPTSDIR = $(ETCPPP)
+BINX11 = $(X11PREFIX)/bin
+USRLOCAL = $(BINX11)
+SBINDIR = /usr/sbin
+VARRUN = /var/run
+USRLIBPPP = $(PREFIX)/libexec
+MANDIR = $(PREFIX)/man/man1
+ETCPPP = /etc/ppp
+OPTSDIR = $(ETCPPP)
#INSTPPPDIR = $(ETCPPP)
-##INSTPPPDIR = $(PREFIX)/share/examples/xisp
-#DESTDIR =
-#GROUP = dialer
-#GCCFLAGS = -Wall -O
-#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
-#EXTRALIBS = -lcrypt
-#LINKX11 = -Wl,-R$(LIBX11)
-#LINKFORMS = -L$(LIBFORMS) -lforms
-#INSTALL = /usr/bin/install
+INSTPPPDIR = $(PREFIX)/share/examples/xisp
+DESTDIR =
+GROUP = dialer
+GCCFLAGS = -Wall -O
+EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
+EXTRALIBS = -lcrypt
+LINKX11 = -Wl,-R$(LIBX11) -Wl,-R$(LOCALBASE)/lib
+LINKFORMS = -L$(LIBFORMS) -L$(LOCALBASE)/lib -lforms -ljpeg -lXpm
+INSTALL = /usr/bin/install
#
# FreeBSD vars
#-------------
@@ -261,16 +261,16 @@
gcc $(GCCOPTS) -c network.c
xispdial: xispdial.c common.h version.h
- gcc $(GCCOPTS) -o xispdial xispdial.c
+ gcc $(GCCOPTS) -L$(LINKX11) -o xispdial xispdial.c
xisprccv: xisprccv.o pcode.o
- gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -lm
+ gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -L$(LINKX11) -lm
xisprccv.o: xisprccv.c common.h version.h pcode.h logs.h
gcc $(GCCOPTS) -c xisprccv.c
xispterm: xispterm.h xispterm.c
- gcc $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lX11 -lm
+ gcc $(GCCOPTS) $(LINKX11) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lX11 -lm
rcio.o: rcio.h rcio.c common.h version.h
gcc $(GCCOPTS) -c rcio.c
@@ -279,7 +279,7 @@
gcc $(GCCOPTS) -c logs.c
xispid: xispid.c
- gcc $(GCCOPTS) -o xispid xispid.c
+ gcc $(GCCOPTS) $(LINKX11) -o xispid xispid.c
install: xisp xispdial xisprccv xispterm xispid
if [ ! -d $(DESTDIR)$(BINX11) ]; then $(INSTALL) -d $(DESTDIR)$(BINX11); fi
|
