Thu Sep 17 07:32:23 1998 Norbert Warmuth <k3190@fh-sw.de>

* Makefile.in: After creating symlinks invoke another instance of
make to build libvfs.a. Otherwise make will not know how to build
the object files if symlinks have been created.
Added target cleansourcelinks (invoked with make distclean).

edit/Makefile.in

@@ -26,7 +26,7 @@ EDITOBJS = edit.o editcmd.o editwidget.o editdraw.o editmenu.o wordproc.o \
 
 DIST = 	Makefile.in README.edit $(EDITSRC)
 
-all: checklinks @LIBEDIT_A@
+all: @LIBEDIT_A@
 
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DMIDNIGHT $<
@@ -41,10 +41,19 @@ checklinks:
 sourcelinks:
 	-cd $(rootdir)/edit ; $(LN_S) ../gtkedit/*.[ch] . >/dev/null 2>&1 ; true
 
-libedit.a: $(EDITOBJS)
-	$(RMF) $@
-	$(AR) cr $@ $(EDITOBJS)
-	-$(RANLIB) $@
+cleansourcelinks:
+	-if test -f $(rootdir)/edit/edit.c; then \
+	    cd $(rootdir)/edit; find . -lname '*.[ch]' | xargs $(RM); \
+	fi
+
+libedit.a: checklinks
+	$(MAKE) mx
+	touch mx
+
+mx: $(EDITOBJS)
+	$(RMF) libedit.a
+	$(AR) cr libedit.a $(EDITOBJS)
+	-$(RANLIB) libedit.a
 
 mcedit:
 	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
@@ -61,14 +70,14 @@ TAGS: $(EDITSRC)
 	etags $(EDITSRC)
 
 clean:
-	$(RMF) *.o core a.out libedit.a
+	$(RMF) *.o core a.out libedit.a mx
 
 realclean: clean
 	$(RMF) .depend
 	$(RMF) TAGS
 	$(RMF) *~
 
-distclean:
+distclean: cleansourcelinks
 	-$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out
 	-$(RMF) $(srcdir)/core $(srcdir)/libedit.a
 	-if test $(srcdir) = .; then $(MAKE) realclean; fi

src/ChangeLog

@@ -1,3 +1,10 @@
+Thu Sep 17 07:32:23 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* Makefile.in: After creating symlinks invoke another instance of
+	make to build libvfs.a. Otherwise make will not know how to build
+	the object files if symlinks have been created.
+	Added target cleansourcelinks (invoked with make distclean).
+
 Tue Sep 15 22:41:24 1998  Paul Sheer <psheer@obsidian.co.za>
 
 	* edit.c, editwidget.c, gtkedit.c: fixed segfault when trying to