diff --git a/src/.cvsignore b/src/.cvsignore index fbfa072cb..a69536358 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -1,7 +1,5 @@ cons.saver -mcmft mcmfmt -mfmt mc man2hlp Makefile diff --git a/src/ChangeLog b/src/ChangeLog index 992e290e3..fc7b77ddf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2000-08-11 Frederic L. W. Meunier" + + * Makefile.in: Don't compile mfmt, compile mcmfmt directly. + 2000-08-08 Andrew V. Samoilov * hotlist.c (done_hotlist): static tkn_buf, tkn_buf_length and diff --git a/src/Makefile.in b/src/Makefile.in index d1f502e76..81eba0233 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -77,11 +77,8 @@ check: mc: $(OBJS) @LIBVFS@ @LIBSLANG@ @LIBEDIT_A@ $(CC) $(LDFLAGS) -o $@ $(OBJS) -L../vfs -L../slang -L../edit $(OURLIBS) $(LIBS) -mfmt: mfmt.o - $(CC) $(LDFLAGS) mfmt.o -o mfmt - -mcmfmt: mfmt - cp mfmt mcmfmt +mcmfmt: mfmt.o + $(CC) $(LDFLAGS) mfmt.o -o mcmfmt libvfs-mc.a: cd ../vfs; $(MAKE) libvfs-mc.a @@ -113,7 +110,7 @@ TAGS: $(SRCS) clean: $(RMF) mc cons.saver man2hlp fixhlp *.o core a.out mc.html mcmfmt - $(RMF) libvfs-mc.a libedit.a libmcslang.a mfmt + $(RMF) libvfs-mc.a libedit.a libmcslang.a realclean: clean $(RMF) .depend @@ -122,7 +119,6 @@ realclean: clean distclean: -$(RMF) $(srcdir)/*~ $(srcdir)/mc $(srcdir)/cons.saver - -$(RMF) $(srcdir)/mfmt -$(RMF) $(srcdir)/man2hlp $(srcdir)/fixhlp $(srcdir)/*.o $(srcdir)/core -$(RMF) $(srcdir)/a.out $(srcdir)/mc.html -$(RMF) $(srcdir)/libvfs-mc.a $(srcdir)/libmcslang.a $(srcdir)/libedit.a