*** Makefile.in.orig Tue Apr 20 22:09:37 1999
--- Makefile.in Tue Apr 20 22:09:38 1999
***************
*** 56,62 ****
BIN_DIR = $(exec_prefix)/bin
# Directory in which to install the include file tk.h:
! INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
--- 56,64 ----
BIN_DIR = $(exec_prefix)/bin
# Directory in which to install the include file tk.h:
! INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tkstep$(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
***************
*** 113,119 ****
# 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@ @EXTRA_LIBS@
# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
--- 115,121 ----
# Libraries to use when linking. This definition is determined by the
# configure script.
! LIBS = -L${PREFIX}/lib -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ @EXTRA_LIBS@
# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
***************
*** 149,155 ****
# "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_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
--- 151,157 ----
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
! INSTALL = install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
***************
*** 206,217 ****
CC = @CC@
CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
! -I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} ${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS}
DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
! -I${BMAP_DIR} \
-I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
${KEYSYM_FLAGS}
--- 208,219 ----
CC = @CC@
CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
! -I${UNIX_DIR} -I${GENERIC_DIR} -I${LOCALBASE}/include \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} ${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS}
DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
! -I${BMAP_DIR} -I${LOCALBASE}/include \
-I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
${KEYSYM_FLAGS}
***************
*** 314,321 ****
--- 316,330 ----
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
+ ln -sf @TK_LIB_FILE@ libtkstep80.so
$(RANLIB) ${TK_LIB_FILE}
+ libtkstep80.a: ${OBJS}
+ rm -f libtkstep80.a
+ ar cr libtkstep80.a ${OBJS}
+ ranlib libtkstep80.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
# extensions. used for the Tcl Plugin. -- dl
***************
*** 331,337 ****
$(TK_CC_SEARCH_FLAGS) -o wish@STEP@
tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
! ${CC} @LD_FLAGS@ $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
$(TK_CC_SEARCH_FLAGS) -o tktest
xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
--- 340,346 ----
$(TK_CC_SEARCH_FLAGS) -o wish@STEP@
tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
! ${CC} @LD_FLAGS@ $(TKTEST_OBJS) $(TK_LIB_FILE) $(LIBS) \
$(TK_CC_SEARCH_FLAGS) -o tktest
xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
***************
*** 370,376 ****
# 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@STEP@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
--- 379,385 ----
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
! install-binaries: $(TK_LIB_FILE) libtkstep80.a wishstep
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
***************
*** 384,396 ****
@$(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 wish@STEP@"
@$(INSTALL_PROGRAM) wish@STEP@ $(BIN_INSTALL_DIR)/wish@STEP@$(VERSION)
@echo "Installing tk@STEP@Config.sh"
! @$(INSTALL_DATA) tk@STEP@Config.sh $(LIB_INSTALL_DIR)/tk@STEP@Config.sh
install-libraries:
@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
--- 393,411 ----
@$(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 libtkstep80.a"
+ @$(INSTALL_DATA) libtkstep80.a $(LIB_INSTALL_DIR)/libtkstep80.a
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtkstep80.a)
+ @chmod 555 $(LIB_INSTALL_DIR)/libtkstep80.a
@echo "Installing wish@STEP@"
@$(INSTALL_PROGRAM) wish@STEP@ $(BIN_INSTALL_DIR)/wish@STEP@$(VERSION)
@echo "Installing tk@STEP@Config.sh"
! @mkdir -p $(TK_LIBRARY)
! @$(INSTALL_DATA) tk@STEP@Config.sh $(TK_LIBRARY)/tkStepConfig.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 \
***************
*** 400,407 ****
else true; \
fi; \
done;
! @echo "Installing tk@STEP@.h"
! @$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk@STEP@.h
for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/*.xbm $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
do \
echo "Installing $$i"; \
--- 415,433 ----
else true; \
fi; \
done;
! @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
! @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tkstep.h
for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/*.xbm $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
do \
echo "Installing $$i"; \
***************
*** 460,487 ****
@cd $(SRC_DIR)/doc; for i in *.1; \
do \
echo "Installing doc/$$i"; \
! rm -f $(MAN1_INSTALL_DIR)/$$i; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! $$i > $(MAN1_INSTALL_DIR)/$$i; \
! chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
@cd $(SRC_DIR)/doc; for i in *.3; \
do \
echo "Installing doc/$$i"; \
! rm -f $(MAN3_INSTALL_DIR)/$$i; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! $$i > $(MAN3_INSTALL_DIR)/$$i; \
! chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
@cd $(SRC_DIR)/doc; for i in *.n; \
do \
echo "Installing doc/$$i"; \
! rm -f $(MANN_INSTALL_DIR)/$$i; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! $$i > $(MANN_INSTALL_DIR)/$$i; \
! chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
--- 486,513 ----
@cd $(SRC_DIR)/doc; for i in *.1; \
do \
echo "Installing doc/$$i"; \
! rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \
! chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \
done;
$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
@cd $(SRC_DIR)/doc; for i in *.3; \
do \
echo "Installing doc/$$i"; \
! rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \
! chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \
done;
$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
@cd $(SRC_DIR)/doc; for i in *.n; \
do \
echo "Installing doc/$$i"; \
! rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \
! chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \
done;
$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
