#18 Five patches for Makefiles and tour.tcl

[kazuro furukawa]

Several bugs/patches as of cvs nov.20.2002.
Kazuro Furukawa, Nov.23.2002.

#####
[1] @BLT_LIB_PREFIX@ in library/Makefile.in

@BLT_LIB_PREFIX@ is not correctly defined in
configure.in and
library/Makefile.in will contain raw @BLT_LIB_PREFIX@
without
any replacement.

(1.1) @BLT_LIB_PREFIX@ can be replaced by @LIB_PREFIX@
in Makefile.in
or
(1.2) @BLT_LIB_PREFIX@ should be handled correctly in
configure

#####
[2] in src/shared/Makefile.in

===
SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ @LD_RUN_PATH@
...
$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o
$(OBJS) \ $(SHLIB_LIB_SPECS)
...
$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o
$(TCL_ONLY_OBJS) \ $(SHLIB_TCL_ONLY_LIB_SPECS)
===

Here, SHLIB_LD_FLAGS is initialized in configure.in as

SHLIB_LD_FLAGS="$TCL_LD_FLAGS"

However, tclConfig.sh.in of tcl-8.4.1 says like this

# Flags to pass to the compiler when linking object
files into
# an executable tclsh or tcltest binary.
TCL_LD_FLAGS='@LDFLAGS@'
===

Thus, we should use a context like tcl

${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS}
${SHLIB_LD_LIBS} \ ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}
${LD_SEARCH_FLAGS}
===

For example, under my environment SHLIB_LD_FLAGS is
"-pthread",
which is a flag for "cc" not for "ld". Currently, I
simply remove
SHLIB_LD_FLAGS from Makefile.

#####
[3] in shared/Makefile.in

bltsh should be built as well as bltwish in shared.

=== line 161
install-demo: $(bltwish)
===
should be replaced with
=== line 161
install-demo: $(bltwish) $(bltsh)
===

#####
[4] in demos/Makefile.in

add hiertable3.tcl container* bitmap2.tcl bgexec5.tcl
to demos

#####
[5] bltTree.c and bltInit.c

Recent modifications to bltTree.c and bltInit.c in CVS
work for me.
Thanks.

#####
[6] tour.tcl

I modified tour.tcl to execute most of the demos. It
is a
minimal patch. The patch is attached.

[kazuro furukawa]

Patch for demos/tour.tcl