1 files changed, 46 insertions, 31 deletions

diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 500bf97..7a872c5 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -25,13 +25,19 @@ LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
 CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
 	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
 
-all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX} pkgooa${SHLIB_SUFFIX}
+all: embtest tcl9pkga${SHLIB_SUFFIX} tcl9pkgb${SHLIB_SUFFIX} tcl9pkgc${SHLIB_SUFFIX} tcl9pkgd${SHLIB_SUFFIX} tcl9pkge${SHLIB_SUFFIX} tcl9pkgua${SHLIB_SUFFIX} tcl9pkgooa${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} pkgua${DLTEST_SUFFIX} pkgooa${DLTEST_SUFFIX}
+dltest_suffix: tcl9pkga${DLTEST_SUFFIX} tcl9pkgb${DLTEST_SUFFIX} tcl9pkgc${DLTEST_SUFFIX} tcl9pkgd${DLTEST_SUFFIX} tcl9pkge${DLTEST_SUFFIX} tcl9pkgua${DLTEST_SUFFIX} tcl9pkgooa${DLTEST_SUFFIX}
 	@touch ../dltest.marker
 
+embtest.o: $(SRC_DIR)/embtest.c
+	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/embtest.c
+
+pkgπ.o: $(SRC_DIR)/pkgπ.c
+	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgπ.c
+
 pkga.o: $(SRC_DIR)/pkga.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkga.c
 
@@ -53,50 +59,59 @@ pkgua.o: $(SRC_DIR)/pkgua.c
 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}
+embtest: embtest.o
+	$(CC) -o $@ embtest.o ${SHLIB_LD_LIBS}
+
+tcl9pkgπ${SHLIB_SUFFIX}: pkgπ.o
+	${SHLIB_LD} -o $@ pkgπ.o ${SHLIB_LD_LIBS}
+
+tcl9pkga${SHLIB_SUFFIX}: pkga.o
+	${SHLIB_LD} -o $@ pkga.o ${SHLIB_LD_LIBS}
+
+tcl9pkgb${SHLIB_SUFFIX}: pkgb.o
+	${SHLIB_LD} -o $@ pkgb.o ${SHLIB_LD_LIBS}
 
-pkgb${SHLIB_SUFFIX}: pkgb.o
-	${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o ${SHLIB_LD_LIBS}
+tcl9pkgc${SHLIB_SUFFIX}: pkgc.o
+	${SHLIB_LD} -o $@ pkgc.o ${SHLIB_LD_LIBS}
 
-pkgc${SHLIB_SUFFIX}: pkgc.o
-	${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o ${SHLIB_LD_LIBS}
+tcl9pkgd${SHLIB_SUFFIX}: pkgd.o
+	${SHLIB_LD} -o $@ pkgd.o ${SHLIB_LD_LIBS}
 
-pkgd${SHLIB_SUFFIX}: pkgd.o
-	${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o ${SHLIB_LD_LIBS}
+tcl9pkge${SHLIB_SUFFIX}: pkge.o
+	${SHLIB_LD} -o $@ pkge.o ${SHLIB_LD_LIBS}
 
-pkge${SHLIB_SUFFIX}: pkge.o
-	${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
+tcl9pkgua${SHLIB_SUFFIX}: pkgua.o
+	${SHLIB_LD} -o $@ pkgua.o ${SHLIB_LD_LIBS}
 
-pkgua${SHLIB_SUFFIX}: pkgua.o
-	${SHLIB_LD} -o pkgua${SHLIB_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
+tcl9pkgooa${SHLIB_SUFFIX}: pkgooa.o
+	${SHLIB_LD} -o $@ pkgooa.o ${SHLIB_LD_LIBS}
 
-pkgooa${SHLIB_SUFFIX}: pkgooa.o
-	${SHLIB_LD} -o pkgooa${SHLIB_SUFFIX} pkgooa.o ${SHLIB_LD_LIBS}
+tcl9pkgπ${DLTEST_SUFFIX}: pkgπ.o
+	${DLTEST_LD} -o $@ pkgπ.o ${SHLIB_LD_LIBS}
 
-pkga${DLTEST_SUFFIX}: pkga.o
-	${DLTEST_LD} -o pkga${DLTEST_SUFFIX} pkga.o ${SHLIB_LD_LIBS}
+tcl9pkga${DLTEST_SUFFIX}: pkga.o
+	${DLTEST_LD} -o $@ pkga.o ${SHLIB_LD_LIBS}
 
-pkgb${DLTEST_SUFFIX}: pkgb.o
-	${DLTEST_LD} -o pkgb${DLTEST_SUFFIX} pkgb.o ${SHLIB_LD_LIBS}
+tcl9pkgb${DLTEST_SUFFIX}: pkgb.o
+	${DLTEST_LD} -o $@ pkgb.o ${SHLIB_LD_LIBS}
 
-pkgc${DLTEST_SUFFIX}: pkgc.o
-	${DLTEST_LD} -o pkgc${DLTEST_SUFFIX} pkgc.o ${SHLIB_LD_LIBS}
+tcl9pkgc${DLTEST_SUFFIX}: pkgc.o
+	${DLTEST_LD} -o $@ pkgc.o ${SHLIB_LD_LIBS}
 
-pkgd${DLTEST_SUFFIX}: pkgd.o
-	${DLTEST_LD} -o pkgd${DLTEST_SUFFIX} pkgd.o ${SHLIB_LD_LIBS}
+tcl9pkgd${DLTEST_SUFFIX}: pkgd.o
+	${DLTEST_LD} -o $@ pkgd.o ${SHLIB_LD_LIBS}
 
-pkge${DLTEST_SUFFIX}: pkge.o
-	${DLTEST_LD} -o pkge${DLTEST_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
+tcl9pkge${DLTEST_SUFFIX}: pkge.o
+	${DLTEST_LD} -o $@ pkge.o ${SHLIB_LD_LIBS}
 
-pkgua${DLTEST_SUFFIX}: pkgua.o
-	${DLTEST_LD} -o pkgua${DLTEST_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
+tcl9pkgua${DLTEST_SUFFIX}: pkgua.o
+	${DLTEST_LD} -o $@ pkgua.o ${SHLIB_LD_LIBS}
 
-pkgooa${DLTEST_SUFFIX}: pkgooa.o
-	${DLTEST_LD} -o pkgooa${DLTEST_SUFFIX} pkgooa.o ${SHLIB_LD_LIBS}
+tcl9pkgooa${DLTEST_SUFFIX}: pkgooa.o
+	${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} ; \