1 files changed, 17 insertions, 60 deletions

diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 01589d9..c0b2659 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -2,17 +2,15 @@
 # command.  It also illustrates how to take advantage of configuration
 # exported by Tcl to set up Makefiles for shared libraries.
 
+TCL_DBGX =		@TCL_DBGX@
 CC = @CC@
-LIBS =			@TCL_BUILD_STUB_LIB_SPEC@ @TCL_LIBS@
+LIBS =			@TCL_BUILD_STUB_LIB_SPEC@ @DL_LIBS@ @LIBS@ @MATH_LIBS@
 AC_FLAGS =		@DEFS@
-SHLIB_LD =		@SHLIB_LD@
 SHLIB_CFLAGS =		@SHLIB_CFLAGS@
+SHLIB_LD =		@SHLIB_LD@
 SHLIB_LD_LIBS =		@SHLIB_LD_LIBS@
 SHLIB_SUFFIX =		@SHLIB_SUFFIX@
-DLTEST_LD =		@DLTEST_LD@
-DLTEST_SUFFIX =		@DLTEST_SUFFIX@
-SRC_DIR =		@TCL_SRC_DIR@/unix/dltest
-BUILD_DIR =		@builddir@
+SRC_DIR =		@srcdir@
 TCL_VERSION=		@TCL_VERSION@
 
 CFLAGS_DEBUG		= @CFLAGS_DEBUG@
@@ -22,80 +20,39 @@ LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
 LDFLAGS_OPTIMIZE	= @LDFLAGS_OPTIMIZE@
 LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
 
-CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -I${BUILD_DIR}/.. -DTCL_MEM_DEBUG \
+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}
-	@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}
+all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX}
 	@touch ../dltest.marker
 
-pkga.o: $(SRC_DIR)/pkga.c
+pkga${SHLIB_SUFFIX}: $(SRC_DIR)/pkga.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkga.c
-
-pkgb.o: $(SRC_DIR)/pkgb.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgb.c
-
-pkgc.o: $(SRC_DIR)/pkgc.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgc.c
-
-pkgd.o: $(SRC_DIR)/pkgd.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgd.c
-
-pkge.o: $(SRC_DIR)/pkge.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkge.c
-
-pkgua.o: $(SRC_DIR)/pkgua.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgua.c
-
-pkga${SHLIB_SUFFIX}: pkga.o
 	${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.o ${SHLIB_LD_LIBS}
 
-pkgb${SHLIB_SUFFIX}: pkgb.o
+pkgb${SHLIB_SUFFIX}: $(SRC_DIR)/pkgb.c
+	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgb.c
 	${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o ${SHLIB_LD_LIBS}
 
-pkgc${SHLIB_SUFFIX}: pkgc.o
+pkgc${SHLIB_SUFFIX}: $(SRC_DIR)/pkgc.c
+	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgc.c
 	${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o ${SHLIB_LD_LIBS}
 
-pkgd${SHLIB_SUFFIX}: pkgd.o
+pkgd${SHLIB_SUFFIX}: $(SRC_DIR)/pkgd.c
+	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgd.c
 	${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o ${SHLIB_LD_LIBS}
 
-pkge${SHLIB_SUFFIX}: pkge.o
+pkge${SHLIB_SUFFIX}: $(SRC_DIR)/pkge.c
+	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkge.c
 	${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
 
-pkgua${SHLIB_SUFFIX}: pkgua.o
-	${SHLIB_LD} -o pkgua${SHLIB_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
-
-pkga${DLTEST_SUFFIX}: pkga.o
-	${DLTEST_LD} -o pkga${DLTEST_SUFFIX} pkga.o ${SHLIB_LD_LIBS}
-
-pkgb${DLTEST_SUFFIX}: pkgb.o
-	${DLTEST_LD} -o pkgb${DLTEST_SUFFIX} pkgb.o ${SHLIB_LD_LIBS}
-
-pkgc${DLTEST_SUFFIX}: pkgc.o
-	${DLTEST_LD} -o pkgc${DLTEST_SUFFIX} pkgc.o ${SHLIB_LD_LIBS}
-
-pkgd${DLTEST_SUFFIX}: pkgd.o
-	${DLTEST_LD} -o pkgd${DLTEST_SUFFIX} pkgd.o ${SHLIB_LD_LIBS}
-
-pkge${DLTEST_SUFFIX}: pkge.o
-	${DLTEST_LD} -o pkge${DLTEST_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
-
-pkgua${DLTEST_SUFFIX}: pkgua.o
-	${DLTEST_LD} -o pkgua${DLTEST_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
-
 clean:
-	rm -f *.o lib.exp ../dltest.marker
+	rm -f *.o config.cache config.log config.status
+	rm -f lib.exp ../dltest.marker
 	@if test "$(SHLIB_SUFFIX)" != ""; then \
 	    echo "rm -f *${SHLIB_SUFFIX}" ; \
 	    rm -f *${SHLIB_SUFFIX} ; \
 	fi
-	@if test "$(DLTEST_SUFFIX)" != ""; then \
-	    echo "rm -f *${DLTEST_SUFFIX}" ; \
-	    rm -f *${DLTEST_SUFFIX} ; \
-	fi
 
 distclean: clean
 	rm -f Makefile