Merge 8.6

1 files changed, 24 insertions, 20 deletions

diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index b1b483b..9a01875 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -22,14 +22,18 @@ LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
 LDFLAGS_OPTIMIZE	= @LDFLAGS_OPTIMIZE@
 LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
 
-CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
+CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic \
 	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
 
-all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgt${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX} pkgooa${SHLIB_SUFFIX}
+all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} \
+	pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgt${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX} \
+	pkgooa${SHLIB_SUFFIX}
 	@if test -n "$(DLTEST_SUFFIX)"; then $(MAKE) dltest_suffix; fi
 	@touch ../dltest.marker
 
-dltest_suffix: pkga${DLTEST_SUFFIX} pkgb${DLTEST_SUFFIX} pkgc${DLTEST_SUFFIX} pkgd${DLTEST_SUFFIX} pkge${DLTEST_SUFFIX} pkgt${DLTEST_SUFFIX} pkgua${DLTEST_SUFFIX} pkgooa${DLTEST_SUFFIX}
+dltest_suffix: pkga${DLTEST_SUFFIX} pkgb${DLTEST_SUFFIX} pkgc${DLTEST_SUFFIX} \
+	pkgd${DLTEST_SUFFIX} pkge${DLTEST_SUFFIX} pkgt${DLTEST_SUFFIX} pkgua${DLTEST_SUFFIX} \
+	pkgooa${DLTEST_SUFFIX}
 	@touch ../dltest.marker
 
 pkga.o: $(SRC_DIR)/pkga.c
@@ -57,55 +61,55 @@ pkgooa.o: $(SRC_DIR)/pkgooa.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgooa.c
 
 pkga${SHLIB_SUFFIX}: pkga.o
-	${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.o ${SHLIB_LD_LIBS}
+	${SHLIB_LD} -o $@ pkga.o ${SHLIB_LD_LIBS}
 
 pkgb${SHLIB_SUFFIX}: pkgb.o
-	${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o ${SHLIB_LD_LIBS}
+	${SHLIB_LD} -o $@ pkgb.o ${SHLIB_LD_LIBS}
 
 pkgc${SHLIB_SUFFIX}: pkgc.o
-	${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o ${SHLIB_LD_LIBS}
+	${SHLIB_LD} -o $@ pkgc.o ${SHLIB_LD_LIBS}
 
 pkgd${SHLIB_SUFFIX}: pkgd.o
-	${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o ${SHLIB_LD_LIBS}
+	${SHLIB_LD} -o $@ pkgd.o ${SHLIB_LD_LIBS}
 
 pkge${SHLIB_SUFFIX}: pkge.o
-	${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
+	${SHLIB_LD} -o $@ pkge.o ${SHLIB_LD_LIBS}
 
 pkgt${SHLIB_SUFFIX}: pkgt.o
-	${SHLIB_LD} -o pkgt${SHLIB_SUFFIX} pkgt.o ${SHLIB_LD_LIBS}
+	${SHLIB_LD} -o $@ pkgt.o ${SHLIB_LD_LIBS}
 
 pkgua${SHLIB_SUFFIX}: pkgua.o
-	${SHLIB_LD} -o pkgua${SHLIB_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
+	${SHLIB_LD} -o $@ pkgua.o ${SHLIB_LD_LIBS}
 
 pkgooa${SHLIB_SUFFIX}: pkgooa.o
-	${SHLIB_LD} -o pkgooa${SHLIB_SUFFIX} pkgooa.o ${SHLIB_LD_LIBS}
+	${SHLIB_LD} -o $@ pkgooa.o ${SHLIB_LD_LIBS}
 
 pkga${DLTEST_SUFFIX}: pkga.o
-	${DLTEST_LD} -o pkga${DLTEST_SUFFIX} pkga.o ${SHLIB_LD_LIBS}
+	${DLTEST_LD} -o $@ pkga.o ${SHLIB_LD_LIBS}
 
 pkgb${DLTEST_SUFFIX}: pkgb.o
-	${DLTEST_LD} -o pkgb${DLTEST_SUFFIX} pkgb.o ${SHLIB_LD_LIBS}
+	${DLTEST_LD} -o $@ pkgb.o ${SHLIB_LD_LIBS}
 
 pkgc${DLTEST_SUFFIX}: pkgc.o
-	${DLTEST_LD} -o pkgc${DLTEST_SUFFIX} pkgc.o ${SHLIB_LD_LIBS}
+	${DLTEST_LD} -o $@ pkgc.o ${SHLIB_LD_LIBS}
 
 pkgd${DLTEST_SUFFIX}: pkgd.o
-	${DLTEST_LD} -o pkgd${DLTEST_SUFFIX} pkgd.o ${SHLIB_LD_LIBS}
+	${DLTEST_LD} -o $@ pkgd.o ${SHLIB_LD_LIBS}
 
 pkge${DLTEST_SUFFIX}: pkge.o
-	${DLTEST_LD} -o pkge${DLTEST_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
+	${DLTEST_LD} -o $@ pkge.o ${SHLIB_LD_LIBS}
 
 pkgt${DLTEST_SUFFIX}: pkgt.o
-	${DLTEST_LD} -o pkgt${DLTEST_SUFFIX} pkgt.o ${SHLIB_LD_LIBS}
+	${DLTEST_LD} -o $@ pkgt.o ${SHLIB_LD_LIBS}
 
 pkgua${DLTEST_SUFFIX}: pkgua.o
-	${DLTEST_LD} -o pkgua${DLTEST_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
+	${DLTEST_LD} -o $@ pkgua.o ${SHLIB_LD_LIBS}
 
 pkgooa${DLTEST_SUFFIX}: pkgooa.o
-	${DLTEST_LD} -o pkgooa${DLTEST_SUFFIX} pkgooa.o ${SHLIB_LD_LIBS}
+	${DLTEST_LD} -o $@ pkgooa.o ${SHLIB_LD_LIBS}
 
 clean:
-	rm -f *.o lib.exp ../dltest.marker
+	rm -f embtest *.o lib.exp ../dltest.marker
 	@if test "$(SHLIB_SUFFIX)" != ""; then \
 	    echo "rm -f *${SHLIB_SUFFIX}" ; \
 	    rm -f *${SHLIB_SUFFIX} ; \