blob: 8dcd5201186f5a2601788b906aec61f9b5d243b9 (
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
38
39
40
41
42
43
44
45
46
47
48
|
$NetBSD: patch-aa,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
--- Makefile.in.orig Thu Jan 11 08:43:46 2001
+++ Makefile.in
@@ -217,6 +217,7 @@
STLIB_LD = @STLIB_LD@
TCL_BIN_DIR = @TCL_BIN_DIR@
+TCL_CC = @TCL_CC@
TCL_DEFS = @TCL_DEFS@
TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@
TCL_LD_FLAGS = @TCL_LD_FLAGS@
@@ -242,17 +243,20 @@
TIX_DEFS = @TIX_DEFS@
TIX_SRC_DIR = @TIX_SRC_DIR@
+X_INCLUDES = @x_includes@
+
AUTOCONF = autoconf
LDFLAGS = $(LDFLAGS_DEFAULT)
-INCLUDES = -I$(TCL_SRC_DIR)/generic \
- -I$(TCL_SRC_DIR)/unix \
- -I$(TK_SRC_DIR)/generic \
- -I$(TK_SRC_DIR)/unix \
+INCLUDES = -I$(BUILDLINK_DIR)/include/tcl/generic \
+ -I$(BUILDLINK_DIR)/include/tcl/unix \
+ -I$(BUILDLINK_DIR)/include/tk/generic \
+ -I$(BUILDLINK_DIR)/include/tk/unix \
-I$(GENERIC_DIR) \
-I$(UNIX_DIR) \
- -I$(WIN_DIR)
+ -I$(WIN_DIR) \
+ -I$(X_INCLUDES)
EXTRA_CFLAGS = $(TCL_DEFS) $(TK_DEFS) \
$(PROTO_FLAGS) $(SECURITY_FLAGS) $(MEM_DEBUG_FLAGS) \
@@ -343,7 +347,8 @@
$(TIX_EXE_FILE): tixAppInit.o
$(CC) @LDFLAGS@ tixAppInit.o \
@TIX_BUILD_LIB_SPEC@ \
- @TK_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ \
+ @TK_LIB_SPEC@ @TCL_LIB_SPEC@ \
+ @TK_LIBS@ @TCL_LIBS@ \
-o $(TIX_EXE_FILE)
#========================================================================
|
