2002-10-05 19:24:40 +02:00
|
|
|
--- Makefile.in.orig Tue Sep 10 21:13:52 2002
|
|
|
|
+++ Makefile.in Mon Sep 30 21:11:16 2002
|
|
|
|
@@ -61,7 +61,9 @@
|
2001-03-08 06:05:57 +01:00
|
|
|
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)
|
1997-08-20 22:00:00 +02:00
|
|
|
|
|
|
|
# Directory in which to install the include file tk.h:
|
2000-05-11 00:55:21 +02:00
|
|
|
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
|
|
|
|
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tk$(VERSION)
|
1997-10-01 11:20:37 +02:00
|
|
|
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
|
|
|
|
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
|
1997-08-20 22:00:00 +02:00
|
|
|
|
|
|
|
# Top-level directory for manual entries:
|
2000-05-11 00:55:21 +02:00
|
|
|
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -113,7 +115,7 @@
|
2001-11-24 05:18:46 +01:00
|
|
|
#CFLAGS = $(CFLAGS_DEBUG)
|
|
|
|
#CFLAGS = $(CFLAGS_OPTIMIZE)
|
|
|
|
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
|
|
|
|
-CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
|
2002-03-17 14:56:36 +01:00
|
|
|
+CFLAGS ?= @CFLAGS@ @CFLAGS_DEFAULT@
|
2001-11-24 05:18:46 +01:00
|
|
|
|
|
|
|
# Flags to pass to the linker
|
|
|
|
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -232,7 +234,7 @@
|
2002-05-09 18:39:18 +02:00
|
|
|
STLIB_LD = @STLIB_LD@
|
|
|
|
SHLIB_LD = @SHLIB_LD@
|
|
|
|
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
2002-10-05 19:24:40 +02:00
|
|
|
-TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@
|
|
|
|
+TK_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@
|
2002-05-09 18:39:18 +02:00
|
|
|
|
|
|
|
# Additional search flags needed to find the various shared libraries
|
|
|
|
# at run-time. The first symbol is for use when creating a binary
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -381,6 +383,8 @@
|
2001-04-13 22:31:09 +02:00
|
|
|
default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \
|
|
|
|
tkPort.h tkScrollbar.h tkText.h
|
|
|
|
|
|
|
|
+INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h
|
|
|
|
+
|
|
|
|
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
|
|
|
|
|
|
|
|
all: binaries libraries doc
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -400,6 +404,12 @@
|
|
|
|
${LIB_FILE}: ${OBJS}
|
|
|
|
rm -f $@
|
1997-09-01 13:46:55 +02:00
|
|
|
@MAKE_LIB@
|
2000-01-05 21:20:28 +01:00
|
|
|
+ ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
|
2002-10-05 19:24:40 +02:00
|
|
|
+
|
2000-01-05 21:20:28 +01:00
|
|
|
+libtk${SHORT_TK_VER}.a: ${OBJS}
|
|
|
|
+ rm -f libtk${SHORT_TK_VER}.a
|
|
|
|
+ ar cr libtk${SHORT_TK_VER}.a ${OBJS}
|
|
|
|
+ $(RANLIB) libtk${SHORT_TK_VER}.a
|
2002-10-05 19:24:40 +02:00
|
|
|
|
1999-06-20 16:05:44 +02:00
|
|
|
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
2002-10-05 19:24:40 +02:00
|
|
|
rm -f $@
|
|
|
|
@@ -497,7 +507,8 @@
|
1997-09-01 13:46:55 +02:00
|
|
|
# some ranlibs write to current directory, and this might not always be
|
|
|
|
# possible (e.g. if installing as root).
|
|
|
|
|
1999-06-20 16:05:44 +02:00
|
|
|
-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
|
2002-10-05 19:24:40 +02:00
|
|
|
+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
|
|
|
|
+ libtk${SHORT_TK_VER}.a wish
|
|
|
|
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
|
1997-09-01 13:46:55 +02:00
|
|
|
do \
|
|
|
|
if [ ! -d $$i ] ; then \
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -523,10 +534,15 @@
|
|
|
|
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
|
|
|
@@INSTALL_LIB@
|
|
|
|
@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
|
2000-01-05 21:20:28 +01:00
|
|
|
+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
|
|
|
|
+ @echo "Installing libtk${SHORT_TK_VER}.a"
|
|
|
|
+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
|
|
|
|
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
|
2000-04-24 23:18:59 +02:00
|
|
|
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
|
1997-08-20 22:00:00 +02:00
|
|
|
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
|
2002-10-05 19:24:40 +02:00
|
|
|
- @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
|
1997-08-20 22:00:00 +02:00
|
|
|
- @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
|
2002-10-05 19:24:40 +02:00
|
|
|
+ @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/tk$(VERSION)"
|
1997-08-20 22:00:00 +02:00
|
|
|
+ @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
|
|
|
|
+ @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
|
1999-06-20 16:05:44 +02:00
|
|
|
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
|
2000-04-24 23:18:59 +02:00
|
|
|
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
|
1999-06-20 16:05:44 +02:00
|
|
|
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -539,6 +555,7 @@
|
1997-08-20 22:00:00 +02:00
|
|
|
|
|
|
|
install-libraries:
|
2000-05-11 00:55:21 +02:00
|
|
|
@for i in $(INCLUDE_INSTALL_DIR) \
|
1997-10-01 11:20:37 +02:00
|
|
|
+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
|
2001-11-24 05:18:46 +01:00
|
|
|
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
|
|
|
|
$(SCRIPT_INSTALL_DIR)/msgs; \
|
1997-10-01 11:20:37 +02:00
|
|
|
do \
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -553,10 +570,18 @@
|
2000-04-24 23:18:59 +02:00
|
|
|
chmod +x $(UNIX_DIR)/install-sh; \
|
|
|
|
fi
|
|
|
|
@echo "Installing header files";
|
2001-11-24 05:18:46 +01:00
|
|
|
- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
|
|
|
|
- $(GENERIC_DIR)/tkPlatDecls.h ; \
|
1997-10-01 11:20:37 +02:00
|
|
|
+ @for i in $(GENERIC_DIR)/*.h ; \
|
2001-11-24 05:18:46 +01:00
|
|
|
do \
|
|
|
|
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
|
2000-04-24 23:18:59 +02:00
|
|
|
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
|
|
|
|
+ done;
|
|
|
|
+ @for i in $(UNIX_DIR)/*.h ; \
|
2001-03-08 06:05:57 +01:00
|
|
|
+ do \
|
|
|
|
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
|
|
|
|
+ done;
|
2001-04-13 22:31:09 +02:00
|
|
|
+ @for i in $(INSTALL_HDRS) ; \
|
2001-11-24 05:18:46 +01:00
|
|
|
+ do \
|
2001-03-08 06:05:57 +01:00
|
|
|
+ j=`basename $$i` ; \
|
|
|
|
+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
|
1999-06-20 16:05:44 +02:00
|
|
|
done;
|
2000-04-24 23:18:59 +02:00
|
|
|
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
|
|
|
|
@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -633,7 +658,6 @@
|
1999-09-05 18:32:10 +02:00
|
|
|
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
|
1997-08-20 22:00:00 +02:00
|
|
|
done;
|
2000-04-24 23:18:59 +02:00
|
|
|
@echo "Cross-linking top-level (.1) docs";
|
2002-10-05 19:24:40 +02:00
|
|
|
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR)
|
2000-04-24 23:18:59 +02:00
|
|
|
@echo "Installing C API (.3) docs";
|
1997-08-20 22:00:00 +02:00
|
|
|
@cd $(SRC_DIR)/doc; for i in *.3; \
|
|
|
|
do \
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -643,7 +667,6 @@
|
1999-09-05 18:32:10 +02:00
|
|
|
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
|
1997-08-20 22:00:00 +02:00
|
|
|
done;
|
2001-03-08 06:05:57 +01:00
|
|
|
@echo "Cross-linking top-level (.3) docs";
|
2002-10-05 19:24:40 +02:00
|
|
|
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR)
|
2000-04-24 23:18:59 +02:00
|
|
|
@echo "Installing command (.n) docs";
|
1997-08-20 22:00:00 +02:00
|
|
|
@cd $(SRC_DIR)/doc; for i in *.n; \
|
|
|
|
do \
|
2002-10-05 19:24:40 +02:00
|
|
|
@@ -653,7 +676,6 @@
|
1999-09-05 18:32:10 +02:00
|
|
|
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
|
1997-08-20 22:00:00 +02:00
|
|
|
done;
|
2000-04-24 23:18:59 +02:00
|
|
|
@echo "Cross-linking command (.n) docs";
|
2002-10-05 19:24:40 +02:00
|
|
|
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
|
1997-08-20 22:00:00 +02:00
|
|
|
|
1999-05-04 22:50:11 +02:00
|
|
|
Makefile: $(UNIX_DIR)/Makefile.in
|
|
|
|
$(SHELL) config.status
|