|
Lines 1-22
Link Here
|
| 1 |
--- Makefile.in.orig Mon Jul 26 14:40:46 2004 |
1 |
--- Makefile.in.orig Sun Jun 5 00:39:25 2005 |
| 2 |
+++ Makefile.in Thu Oct 28 10:51:40 2004 |
2 |
+++ Makefile.in Sat Jun 25 19:25:44 2005 |
| 3 |
@@ -59,2 +59,4 @@ |
3 |
@@ -57,6 +57,8 @@ |
|
|
4 |
|
| 5 |
# Directory in which to install the include file tcl.h: |
| 4 |
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) |
6 |
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) |
| 5 |
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic |
7 |
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic |
| 6 |
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix |
8 |
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix |
| 7 |
|
9 |
|
| 8 |
@@ -92,3 +94,3 @@ |
10 |
# Path to the private tcl header dir: |
|
|
11 |
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ |
| 12 |
@@ -102,7 +104,7 @@ |
| 13 |
#CFLAGS = $(CFLAGS_DEBUG) |
| 14 |
#CFLAGS = $(CFLAGS_OPTIMIZE) |
| 9 |
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) |
15 |
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) |
| 10 |
-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) |
16 |
-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) |
| 11 |
+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) |
17 |
+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) |
| 12 |
|
18 |
|
| 13 |
@@ -447,3 +449,4 @@ |
19 |
# Flags to pass to the linker |
|
|
20 |
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ |
| 21 |
@@ -461,7 +463,8 @@ |
| 22 |
|
| 23 |
all: binaries libraries doc |
| 14 |
|
24 |
|
| 15 |
-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh |
25 |
-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh |
| 16 |
+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ |
26 |
+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ |
| 17 |
+ libtcl${SHORT_TCL_VER}.a tclsh |
27 |
+ libtcl${SHORT_TCL_VER}.a tclsh |
| 18 |
|
28 |
|
| 19 |
@@ -458,2 +461,11 @@ |
29 |
libraries: |
|
|
30 |
|
| 31 |
@@ -472,6 +475,15 @@ |
| 32 |
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} |
| 33 |
rm -f $@ |
| 20 |
@MAKE_LIB@ |
34 |
@MAKE_LIB@ |
| 21 |
+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so |
35 |
+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so |
| 22 |
+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ |
36 |
+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ |
|
Lines 28-34
Link Here
|
| 28 |
+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} |
42 |
+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} |
| 29 |
+ $(RANLIB) libtcl${SHORT_TCL_VER}.a |
43 |
+ $(RANLIB) libtcl${SHORT_TCL_VER}.a |
| 30 |
|
44 |
|
| 31 |
@@ -604,2 +616,8 @@ |
45 |
${STUB_LIB_FILE}: ${STUB_LIB_OBJS} |
|
|
46 |
rm -f $@ |
| 47 |
@@ -620,6 +632,12 @@ |
| 48 |
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" |
| 49 |
@@INSTALL_LIB@ |
| 32 |
@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) |
50 |
@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) |
| 33 |
+ @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so |
51 |
+ @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so |
| 34 |
+ @echo "Installing libtcl${SHORT_TCL_VER}.a" |
52 |
+ @echo "Installing libtcl${SHORT_TCL_VER}.a" |
|
Lines 37-43
Link Here
|
| 37 |
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a) |
55 |
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a) |
| 38 |
+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a |
56 |
+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a |
| 39 |
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ |
57 |
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ |
| 40 |
@@ -611,4 +629,5 @@ |
58 |
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ |
|
|
59 |
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ |
| 60 |
@@ -627,8 +645,9 @@ |
| 61 |
fi |
| 62 |
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" |
| 41 |
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) |
63 |
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) |
| 42 |
- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" |
64 |
- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" |
| 43 |
- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh |
65 |
- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh |
|
Lines 45-84
Link Here
|
| 45 |
+ @mkdir -p $(SCRIPT_INSTALL_DIR) |
67 |
+ @mkdir -p $(SCRIPT_INSTALL_DIR) |
| 46 |
+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh |
68 |
+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh |
| 47 |
@if test "$(STUB_LIB_FILE)" != "" ; then \ |
69 |
@if test "$(STUB_LIB_FILE)" != "" ; then \ |
| 48 |
@@ -619,3 +638,4 @@ |
70 |
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ |
|
|
71 |
@INSTALL_STUB_LIB@ ; \ |
| 72 |
@@ -636,7 +655,8 @@ |
| 73 |
@EXTRA_INSTALL_BINARIES@ |
| 74 |
|
| 49 |
install-libraries: libraries |
75 |
install-libraries: libraries |
| 50 |
- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ |
76 |
- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ |
| 51 |
+ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ |
77 |
+ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ |
| 52 |
+ $(SCRIPT_INSTALL_DIR); \ |
78 |
+ $(SCRIPT_INSTALL_DIR); \ |
| 53 |
do \ |
79 |
do \ |
| 54 |
@@ -641,7 +661,13 @@ |
80 |
if [ ! -d $$i ] ; then \ |
|
|
81 |
echo "Making directory $$i"; \ |
| 82 |
@@ -658,11 +678,17 @@ |
| 83 |
chmod +x $(SRC_DIR)/install-sh; \ |
| 84 |
fi |
| 55 |
@echo "Installing header files"; |
85 |
@echo "Installing header files"; |
| 56 |
- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ |
86 |
- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ |
| 57 |
- $(GENERIC_DIR)/tclPlatDecls.h ; \ |
87 |
- $(GENERIC_DIR)/tclPlatDecls.h; \ |
| 58 |
+ @for i in $(GENERIC_DIR)/*.h ; \ |
88 |
- do \ |
| 59 |
do \ |
|
|
| 60 |
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ |
89 |
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ |
| 61 |
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ |
90 |
- done; |
| 62 |
done; |
91 |
+ @for i in $(GENERIC_DIR)/*.h ; \ |
|
|
92 |
+ do \ |
| 93 |
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ |
| 94 |
+ done; |
| 63 |
+ @for i in $(UNIX_DIR)/*.h ; \ |
95 |
+ @for i in $(UNIX_DIR)/*.h ; \ |
| 64 |
+ do \ |
96 |
+ do \ |
| 65 |
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ |
97 |
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ |
| 66 |
+ done; |
98 |
+ done; |
| 67 |
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h |
99 |
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h |
| 68 |
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h |
100 |
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h |
| 69 |
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h |
101 |
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h |
| 70 |
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; |
102 |
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; |
| 71 |
@@ -703,3 +729,2 @@ |
103 |
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ |
| 72 |
@echo "Cross-linking top-level (.1) docs"; |
104 |
do \ |
| 73 |
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR) |
105 |
@@ -713,18 +739,25 @@ |
| 74 |
@echo "Installing C API (.3) docs"; |
106 |
done; |
| 75 |
@@ -713,3 +738,2 @@ |
107 |
@echo "Installing and cross-linking top-level (.1) docs"; |
| 76 |
@echo "Cross-linking C API (.3) docs"; |
108 |
@for i in $(TOP_DIR)/doc/*.1; do \ |
| 77 |
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR) |
109 |
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \ |
| 78 |
@echo "Installing command (.n) docs"; |
110 |
+ cp $$i $(MAN1_INSTALL_DIR); \ |
| 79 |
@@ -723,3 +747,10 @@ |
111 |
done |
| 80 |
@echo "Cross-linking command (.n) docs"; |
112 |
- |
| 81 |
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR) |
113 |
@echo "Installing and cross-linking C API (.3) docs"; |
|
|
114 |
@for i in $(TOP_DIR)/doc/*.3; do \ |
| 115 |
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \ |
| 116 |
+ cp $$i $(MAN3_INSTALL_DIR); \ |
| 117 |
done |
| 118 |
- |
| 119 |
@echo "Installing and cross-linking command (.n) docs"; |
| 120 |
@for i in $(TOP_DIR)/doc/*.n; do \ |
| 121 |
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \ |
| 122 |
+ cp $$i $(MANN_INSTALL_DIR); \ |
| 123 |
done |
| 82 |
+ @echo "**********" |
124 |
+ @echo "**********" |
| 83 |
+ @echo "IMPORTANT:" |
125 |
+ @echo "IMPORTANT:" |
| 84 |
+ @echo "**********" |
126 |
+ @echo "**********" |
|
Lines 87-90
Link Here
|
| 87 |
+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" |
129 |
+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" |
| 88 |
+ @echo "There are NOT default place, but good place to avoid" |
130 |
+ @echo "There are NOT default place, but good place to avoid" |
| 89 |
+ @echo "conflicting with another version of Tcl/Tks." |
131 |
+ @echo "conflicting with another version of Tcl/Tks." |
|
|
132 |
+ |
| 90 |
|
133 |
|
|
|
134 |
# Optional target to install private headers |
| 135 |
install-private-headers: libraries |