--- a/src/Makefile.in	Wed Sep 29 23:23:37 1993 +0000
+++ b/src/Makefile.in	Wed Sep 29 23:24:19 1993 +0000
@@ -51,18 +51,32 @@
 	    mv $@.tmp $@ ; \
 	fi
 
+# And one for .c files.too:
+
+%.d: %.c
+	rm -f $@
+	-if test "$(srcdir)" = "." ; then \
+	  $(CC) -MM $(CPPFLAGS) $(ALL_CFLAGS) $< | \
+	    sed -e 's/$*\.o/& $@/g' > $@.tmp && \
+	    mv $@.tmp $@ ; \
+	else \
+	  $(CC) -MM $(CPPFLAGS) $(ALL_CFLAGS) $< | \
+	    sed -e 's/$*\.o/& $@/g' -e 's,$(srcdir)/,,g' > $@.tmp && \
+	    mv $@.tmp $@ ; \
+	fi
+
 INCLUDES = arith-ops.h builtins.h dynamic-ld.h defaults.h.in \
 	defaults.h error.h f-balance.h f-colloc.h f-dassl.h f-det.h \
 	f-eig.h f-expm.h f-fft.h f-fsolve.h f-fsqp.h f-givens.h \
 	f-hess.h f-ifft.h f-inv.h f-lpsolve.h f-lsode.h f-lu.h \
 	f-npsol.h f-qpsol.h f-qr.h f-quad.h f-qzval.h f-rand.h \
-	f-schur.h f-svd.h f-syl.h file-io.h g-builtins.h gripes.h \
-	help.h idx-vector.h input.h lex.h mappers.h missing-math.h \
-	octave.h octave-hist.h pager.h parse.h pr-output.h \
-	procstream.h sighandlers.h statdefs.h symtab.h sysdep.h \
-	t-builtins.h tree-base.h tree-const.h tree.h unwind-prot.h \
-	user-prefs.h utils.h variables.h version.h xdiv.h xpow.h \
-	SLStack.h Stack.h
+	f-schur.h f-svd.h f-syl.h file-io.h g-builtins.h getopt.h \
+	gripes.h help.h idx-vector.h input.h lex.h mappers.h \
+	missing-math.h octave.h octave-hist.h pager.h parse.h \
+	pr-output.h procstream.h sighandlers.h statdefs.h symtab.h \
+	sysdep.h t-builtins.h tree-base.h tree-const.h tree.h \
+	unwind-prot.h user-prefs.h utils.h variables.h version.h \
+	xdiv.h xpow.h SLStack.h Stack.h
 
 SOURCES = arith-ops.cc builtins.cc dynamic-ld.cc error.cc \
 	f-colloc.cc f-balance.cc f-dassl.cc f-det.cc f-eig.cc \
@@ -70,16 +84,17 @@
 	f-hess.cc f-ifft.cc f-inv.cc f-lpsolve.cc f-lsode.cc f-lu.cc \
 	f-npsol.cc f-qpsol.cc f-qr.cc f-quad.cc f-qzval.cc f-rand.cc \
 	f-schur.cc f-svd.cc f-syl.cc file-io.cc	g-builtins.cc \
-	gripes.cc help.cc idx-vector.cc input.cc lex.l mappers.cc \
-	octave.cc octave-hist.cc pager.cc parse.y pr-output.cc \
-	procstream.cc sighandlers.cc symtab.cc sysdep.cc \
-	t-builtins.cc tc-assign.cc tc-extras.cc tc-index.cc \
-	tc-inlines.cc tree.cc tree-const.cc tree-plot.cc \
+	getopt.c getopt1.c gripes.cc help.cc idx-vector.cc input.cc \
+	lex.l mappers.cc octave.cc octave-hist.cc pager.cc parse.y \
+	pr-output.cc procstream.cc sighandlers.cc symtab.cc \
+	sysdep.cc t-builtins.cc tc-assign.cc tc-extras.cc \
+	tc-index.cc tc-inlines.cc tree.cc tree-const.cc tree-plot.cc \
 	unwind-prot.cc user-prefs.cc utils.cc variables.cc xdiv.cc \
 	xpow.cc
 
-DEP_SOURCES_1 = $(patsubst %.l, %.cc, $(SOURCES))
-DEP_SOURCES = $(patsubst %.y, %.cc, $(DEP_SOURCES_1))
+DEP_SOURCES_2 = $(patsubst %.l, %.cc, $(SOURCES))
+DEP_SOURCES_1 = $(patsubst %.y, %.cc, $(DEP_SOURCES_2))
+DEP_SOURCES = $(patsubst %.c, %.d, $(DEP_SOURCES_1))
 MAKEDEPS = $(patsubst %.cc, %.d, $(DEP_SOURCES))
 
 DLD_OBJECTS = f-balance.o f-colloc.o f-dassl.o f-det.o f-eig.o \
@@ -89,12 +104,12 @@
 	f-svd.o f-syl.o 
 
 OBJECTS = arith-ops.o builtins.o error.o file-io.o g-builtins.o \
-	gripes.o help.o idx-vector.o input.o lex.o mappers.o \
-	octave.o octave-hist.o pager.o parse.o pr-output.o \
-	procstream.o sighandlers.o symtab.o sysdep.o t-builtins.o \
-	tc-assign.o tc-extras.o tc-index.o tree.o tree-const.o \
-	tree-plot.o unwind-prot.o user-prefs.o utils.o variables.o \
-	xdiv.o xpow.o \
+	getopt.o getopt1.o gripes.o help.o idx-vector.o input.o \
+	lex.o mappers.o octave.o octave-hist.o pager.o parse.o \
+	pr-output.o procstream.o sighandlers.o symtab.o sysdep.o \
+	t-builtins.o tc-assign.o tc-extras.o tc-index.o tree.o \
+	tree-const.o tree-plot.o unwind-prot.o user-prefs.o utils.o \
+	variables.o xdiv.o xpow.o \
 	@DYNAMIC_LD_OBJ@
 
 OCTAVE_LIBS = ../liboctave.a ../libcruft.a ../libreadline.a @LIBDLD@