114 lines
4.0 KiB
Plaintext
114 lines
4.0 KiB
Plaintext
--- Makefile.in.orig Tue Mar 9 01:53:50 1999
|
|
+++ Makefile.in Thu Jan 13 21:11:54 2000
|
|
@@ -56,7 +56,9 @@
|
|
BIN_DIR = $(exec_prefix)/bin
|
|
|
|
# Directory in which to install the include file tk.h:
|
|
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
|
|
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tk$(VERSION)
|
|
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
|
|
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
|
|
|
|
# Top-level directory for manual entries:
|
|
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
|
|
@@ -97,7 +99,7 @@
|
|
#CFLAGS = $(CFLAGS_DEBUG)
|
|
#CFLAGS = $(CFLAGS_OPTIMIZE)
|
|
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
|
|
-CFLAGS = $(@CFLAGS_DEFAULT@)
|
|
+#CFLAGS = $(@CFLAGS_DEFAULT@)
|
|
|
|
# A "-I" switch that can be used when compiling to make all of the
|
|
# X11 include files accessible (the configure script will try to
|
|
@@ -112,7 +114,7 @@
|
|
|
|
# Libraries to use when linking. This definition is determined by the
|
|
# configure script.
|
|
-LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
|
|
+LIBS = -L${PREFIX}/lib -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
|
|
|
|
# To turn off the security checks that disallow incoming sends when
|
|
# the X server appears to be insecure, reverse the comments on the
|
|
@@ -148,7 +150,7 @@
|
|
# "install" around; better to use the install-sh script that comes
|
|
# with the distribution, which is slower but guaranteed to work.
|
|
|
|
-INSTALL = @srcdir@/install-sh -c
|
|
+INSTALL = install -c
|
|
INSTALL_PROGRAM = ${INSTALL}
|
|
INSTALL_DATA = ${INSTALL} -m 644
|
|
|
|
@@ -302,14 +304,18 @@
|
|
|
|
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
|
|
|
|
-all: wish
|
|
+all: ${TK_LIB_FILE} libtk80.a wish
|
|
|
|
# The following target is configured by autoconf to generate either
|
|
# a shared library or non-shared library for Tk.
|
|
${TK_LIB_FILE}: ${OBJS}
|
|
rm -f ${TK_LIB_FILE}
|
|
@MAKE_LIB@
|
|
- $(RANLIB) ${TK_LIB_FILE}
|
|
+
|
|
+libtk80.a: ${OBJS}
|
|
+ rm -f libtk80.a
|
|
+ ar cr libtk80.a ${OBJS}
|
|
+ $(RANLIB) libtk80.a
|
|
|
|
# Make target which outputs the list of the .o contained in the Tk lib
|
|
# usefull to build a single big shared library containing Tcl/Tk and other
|
|
@@ -365,7 +371,7 @@
|
|
# some ranlibs write to current directory, and this might not always be
|
|
# possible (e.g. if installing as root).
|
|
|
|
-install-binaries: $(TK_LIB_FILE) wish
|
|
+install-binaries: $(TK_LIB_FILE) libtk80.a wish
|
|
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
@@ -377,15 +383,19 @@
|
|
done;
|
|
@echo "Installing $(TK_LIB_FILE)"
|
|
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
|
|
- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
|
|
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
|
|
+ @echo "Installing libtk80.a"
|
|
+ @$(INSTALL_DATA) libtk80.a $(LIB_INSTALL_DIR)/libtk80.a
|
|
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk80.a
|
|
@echo "Installing wish"
|
|
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
|
|
@echo "Installing tkConfig.sh"
|
|
- @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
|
|
+ @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
|
|
+ @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
|
|
|
|
install-libraries:
|
|
@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
|
|
+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
|
|
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
@@ -395,8 +405,18 @@
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
- @echo "Installing tk.h"
|
|
- @$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
|
|
+ @echo "Installing headers"
|
|
+ @for i in $(GENERIC_DIR)/*.h ; \
|
|
+ do \
|
|
+ echo "Installing $$i"; \
|
|
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
|
|
+ done;
|
|
+ @for i in $(UNIX_DIR)/*.h ; \
|
|
+ do \
|
|
+ echo "Installing $$i"; \
|
|
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
|
|
+ done;
|
|
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
|
|
for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
|
|
do \
|
|
echo "Installing $$i"; \
|