Use more strict compilation-flags (but not -DTCL_MEM_DEBUG) in unix/dltest/Makefile

2 files changed, 25 insertions, 23 deletions

diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 25b9376..a82f643 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -17,19 +17,23 @@ TCL_VERSION=		@TCL_VERSION@
 
 CFLAGS_DEBUG		= @CFLAGS_DEBUG@
 CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
-CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@
+CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_NO_DEPRECATED=1 -Wall -Wextra -Wc++-compat -Wconversion -Werror
 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} pkgua${SHLIB_SUFFIX} pkgooa${SHLIB_SUFFIX}
+all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} \
+	pkgd${SHLIB_SUFFIX} pkge${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} pkgua${DLTEST_SUFFIX} pkgooa${DLTEST_SUFFIX}
+dltest_suffix: pkga${DLTEST_SUFFIX} pkgb${DLTEST_SUFFIX} pkgc${DLTEST_SUFFIX} \
+	pkgd${DLTEST_SUFFIX} pkge${DLTEST_SUFFIX} pkgua${DLTEST_SUFFIX} \
+	pkgooa${DLTEST_SUFFIX}
 	@touch ../dltest.marker
 
 pkga.o: $(SRC_DIR)/pkga.c
@@ -54,49 +58,49 @@ 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}
 
 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}
 
 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} ; \
diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c
index d731e48..aed89fe 100644
--- a/unix/dltest/pkgooa.c
+++ b/unix/dltest/pkgooa.c
@@ -84,10 +84,8 @@ static TclOOStubs stubsCopy = {
     NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL
-#ifdef Tcl_MethodIsPrivate
-    ,NULL
-#endif
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL
 };
 
 DLLEXPORT int