blob: 3fb970d058d6b99ecda17594bb4886b1d861674f (
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
|
$NetBSD: patch-ad,v 1.6 2004/06/21 08:23:48 martti Exp $
--- src/Makefile.orig 2004-05-16 13:52:54.000000000 +0000
+++ src/Makefile 2004-06-11 21:40:33.000000000 +0000
@@ -1076,3 +1076,3 @@
#XAW_LIB = -lXaw3d
-XAW_LIB = -lXaw
+#XAW_LIB = -lXaw
@@ -1080,8 +1080,11 @@
### scrollbars from Xaw3d.
-#ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
-#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
-# objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
-#ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
-# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
-# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
+.if defined(XAW_LIB)
+.if (${XAW_LIB} != "Xaw")
+ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
+ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
+ objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
+ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
+ -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
+ -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
+.else
ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
@@ -1092,2 +1095,4 @@
ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
+.endif # Xaw
+.endif # defined(XAW_LIB)
@@ -1095,3 +1100,3 @@
ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
-ATHENA_LIBS1 = $(XAW_LIB)
+ATHENA_LIBS1 = $(LIBXAW)
ATHENA_LIBS2 = -lXt
|
