diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in
index c571b7255..9669eb2c7 100644
--- a/appl/kx/Makefile.in
+++ b/appl/kx/Makefile.in
@@ -87,12 +87,6 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 KLIB= -L../../lib/krb -lkrb -L../../lib/des -ldes
 LIBROKEN=-L../../lib/roken -lroken
 
@@ -119,4 +113,4 @@ tenletxr: tenletxr.in
 
 $(OBJECTS): ../../include/config.h
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in
index 86b8e7f74..ef996abc5 100644
--- a/appl/popper/Makefile.in
+++ b/appl/popper/Makefile.in
@@ -92,12 +92,6 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
 LIBROKEN=-L../../lib/roken -lroken
 OTPLIB=@LIB_otp@
@@ -110,4 +104,4 @@ pop_debug$(EXECSUFFIX): $(POP_DEBUG_OBJECTS)
 
 $(OBJECTS): ../../include/config.h
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
index d1d3218f8..533855076 100644
--- a/appl/telnet/telnet/Makefile.in
+++ b/appl/telnet/telnet/Makefile.in
@@ -29,10 +29,10 @@ EXECSUFFIX=@EXECSUFFIX@
 
 SOURCES=authenc.c commands.c main.c network.c ring.c \
 	sys_bsd.c telnet.c terminal.c \
-	utilities.c $(GETOPT_SRC)
+	utilities.c
 
 OBJECTS=authenc.o commands.o main.o network.o ring.o sys_bsd.o \
-	telnet.o terminal.o utilities.o $(GETOPT_OBJ)
+	telnet.o terminal.o utilities.o
 
 libtop=@libtop@
 
diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in
index d08f3338c..6275d0fe5 100644
--- a/appl/xnlock/Makefile.in
+++ b/appl/xnlock/Makefile.in
@@ -87,12 +87,6 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
 LIBROKEN=-L../../lib/roken -lroken
 
@@ -101,4 +95,4 @@ xnlock$(EXECSUFFIX): xnlock.o
 
 $(OBJECTS): ../../include/config.h
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in
index d4eb33672..dac1e7b26 100644
--- a/lib/auth/afskauthlib/Makefile.in
+++ b/lib/auth/afskauthlib/Makefile.in
@@ -76,16 +76,10 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 $(OBJECTS): ../../../include/config.h
 
 $(LIB): $(OBJECTS)
 	rm -f $@
 	$(LDSHARED) $(CFLAGS) -o $@ $(OBJECTS) $(LD_FLAGS) $(LIB_DEPS)
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in
index ae79e18f1..d37a11702 100644
--- a/lib/auth/pam/Makefile.in
+++ b/lib/auth/pam/Makefile.in
@@ -72,13 +72,6 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-
 $(OBJECTS): ../../../include/config.h
 
 $(LIB): $(OBJECTS)
@@ -86,4 +79,4 @@ $(LIB): $(OBJECTS)
 	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) $(LIB_DEPS)
 #	$(LINK) -shared -Wl,-x -o $(LIB) $(OBJECTS)  ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in
index f773f36e5..3ad239f0f 100644
--- a/lib/auth/sia/Makefile.in
+++ b/lib/auth/sia/Makefile.in
@@ -78,17 +78,10 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-
 $(OBJECTS): ../../../include/config.h
 
 $(LIB): $(OBJECTS)
 	rm -f $@
 	$(LDSHARED) -shared -o $@ -rpath $(libdir) -hidden -exported_symbol siad_\* $(OBJECTS) $(LIB_DEPS)
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
diff --git a/lib/com_err/Makefile.in b/lib/com_err/Makefile.in
index 67c66fe92..dd8c1f261 100644
--- a/lib/com_err/Makefile.in
+++ b/lib/com_err/Makefile.in
@@ -107,20 +107,14 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 $(LIBNAME).a: $(OBJECTS)
 	rm -f $@
 	$(AR) cr $@ $(OBJECTS)
 	-$(RANLIB) $@
 
-$(LIBNAME).$(SHLIBEXT): $(OBJECTS) $(LDOBJ)
+$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS) $(LDOBJ) $(LIB_DEPS)
+	$(LDSHARED) -o $@ $(OBJECTS) $(LIB_DEPS)
 	@build_symlink_command@
 
 COBJ = compile_et.o parse.o lex.o
@@ -143,4 +137,4 @@ lex.c: $(srcdir)/lex.l
 snprintf.c:
 	$(LN_S) $(srcdir)/../roken/snprintf.c .
 
-.PHONY: all Wall install uninstall clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall clean mostlyclean distclean realclean
diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in
index ab3f78913..6c1b29079 100644
--- a/lib/des/Makefile.in
+++ b/lib/des/Makefile.in
@@ -112,12 +112,6 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 $(LIBNAME).a: $(LIBOBJ)
 	rm -f $@
 	$(AR) cr $@ $(LIBOBJ)
@@ -158,4 +152,4 @@ speed$(EXECSUFFIX): speed.o $(LIB)
 
 $(LIBOBJ): ../../include/config.h
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in
index eb08af16f..19f6d710a 100644
--- a/lib/editline/Makefile.in
+++ b/lib/editline/Makefile.in
@@ -82,12 +82,6 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 $(LIBNAME).a: $(libeditline_a_OBJECTS)
 	rm -f $@
 	$(AR) cr $@ $(libeditline_a_OBJECTS)
@@ -109,4 +103,4 @@ $(OBJECTS): ../../include/config.h
 strdup.c:
 	$(LN_S) $(srcdir)/../roken/strdup.c .
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index 27c8fe76d..30123b06d 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -80,12 +80,6 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 $(LIBNAME).a: $(OBJECTS)
 	rm -f $@
 	$(AR) cr $@ $(OBJECTS)
@@ -107,7 +101,7 @@ $(OBJECTS): ../../include/config.h roken_rename.h
 roken_rename.h:
 	$(LN_S) $(srcdir)/../krb/roken_rename.h .
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean
 
 issuid.c:
 	$(LN_S) $(srcdir)/../roken/issuid.c .
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index 4ba9bb800..6dcabdc3a 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -145,7 +145,7 @@ check:
 
 clean:
 	rm -f $(LIB) *.o *.a roken.h make-roken$(EXECSUFFIX) make-roken.c \
-		make-print-version$(EXECSUFFIC) print_version.h
+		make-print-version$(EXECSUFFIX) print_version.h
 
 mostlyclean: clean
 
@@ -155,12 +155,6 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
 $(LIBNAME).a: $(OBJECTS)
 	rm -f $@
 	$(AR) cr $@ $(OBJECTS)
@@ -183,8 +177,8 @@ make-roken.c: roken.h.in roken.awk
 
 print_version.o: print_version.h
 
-print_version.h: make-print-version$(EXECSUFFIC)
-	@./make-print-version$(EXECSUFFIC) print_version.h
+print_version.h: make-print-version$(EXECSUFFIX)
+	@./make-print-version$(EXECSUFFIX) print_version.h
 
 make-print-version$(EXECSUFFIX): make-print-version.o
 	$(LINK) $(CFLAGS) -o $@ make-print-version.o
@@ -197,4 +191,4 @@ install-roken-h: roken.h
 
 $(OBJECTS): ../../include/config.h roken.h
 
-.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist install-roken-h
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean install-roken-h