diff --git a/ChangeLog b/ChangeLog index d4866f507..5951ec9e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-09-23 Pavel Roskin <proski@gnu.org> + + * configure: Always include Make.common as file, otherwise + "make distclean" breaks. + * edit/Makefile.in, gnome/Makefile.in, gtkedit/Makefile.in, + slang/Makefile.in, src/Makefile.in, vfs/Make-mc.in: $(RMF) + replaced with "rm -f" - the stangard says that "rm" is portable. + Ditto $(MV). Adjusted *clean targets to match those in + Automake. Removed "cross" target. + 2000-09-22 Pavel Roskin <proski@gnu.org> * doc/mc.sgml: Removed as obsoleted by doc/mc.in.1 diff --git a/configure.in b/configure.in index c916880ee..7f2664044 100644 --- a/configure.in +++ b/configure.in @@ -1090,23 +1090,20 @@ AC_SUBST(LIBS) ac_cv_make_with_percent_rules=no if test x$ac_cv_prog_gnu_make = xyes; then - MCFG='include ../Make.common' - MCF=/dev/null PHONY='.PHONY:' DOTDEPEND='-include .depend' WRITEDEP=":" ac_cv_make_with_percent_rules=yes else - MCFG="" - MCF=./Make.common PHONY='#' DOTDEPEND="" WRITEDEP='sed "/^. \*\*\*Dependencies\*\*\*/,/^. \*\*\*End of dependencies\*\*\*/d" < Makefile > Makefile.conf; { cat Makefile.conf; echo "# ***Dependencies***Do not edit***"; cat .depend; echo "# ***End of dependencies***" } > Makefile; $(RMF) Makefile.conf .depend' fi AC_SUBST(PHONY) AC_SUBST(WRITEDEP) -AC_SUBST(MCFG) AC_SUBST(DOTDEPEND) + +MCF=./Make.common AC_SUBST_FILE(MCF) if test x$ac_cv_make_with_percent_rules = xyes; then diff --git a/edit/Makefile.in b/edit/Makefile.in index 586a250f4..8baf71a41 100644 --- a/edit/Makefile.in +++ b/edit/Makefile.in @@ -4,7 +4,7 @@ VPATH = @srcdir@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs top_builddir = .. -@MCFG@@MCF@ +@MCF@ CFLAGS = $(XCFLAGS) CPPFLAGS = $(XCPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/edit \ @@ -48,42 +48,37 @@ $(EDITLINKS): done libedit.a: $(EDITOBJS) - $(RMF) libedit.a + rm -f libedit.a $(AR) cr libedit.a $(EDITOBJS) -$(RANLIB) libedit.a mcedit: - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit + rm -f $(DESTDIR)$(bindir)/$(binprefix)mcedit $(LN_S) mc $(DESTDIR)$(bindir)/$(binprefix)mcedit showlibdep: @echo 'OBJS="$(EDITOBJS)"' -cross: - $(MAKE) CC=gcc-linux CPP="gcc-linux -E" \ - CPPFLAGS="$(CPPFLAGS) -I/usr/local/lib/gcc-lib/i386-linux-linux/include/ncurses " - TAGS: $(EDITSRC) etags $(EDITSRC) -clean: - $(RMF) *.o core a.out libedit.a $(EDITLINKS) +mostlyclean: + rm -f *.o core a.out -realclean: clean - $(RMF) .depend - $(RMF) TAGS - $(RMF) *~ +clean: mostlyclean + rm -f libedit.a -distclean: - $(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out - $(RMF) $(srcdir)/core $(srcdir)/libedit.a - -if test $(srcdir) = .; then $(MAKE) realclean; fi - $(RMF) $(srcdir)/Makefile +distclean: clean + rm -f $(EDITLINKS) + rm -f .depend + rm -f TAGS + rm -f *~ + rm -f Makefile install: @MCEDIT@ uninstall: - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit + rm -f $(DESTDIR)$(bindir)/$(binprefix)mcedit distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) diff --git a/gnome/Makefile.in b/gnome/Makefile.in index f716ee070..b317ea246 100644 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -5,7 +5,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs top_builddir = .. top_srcdir = $(srcdir)/.. -@MCFG@@MCF@ +@MCF@ GNOMEDEFS = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@ @@ -281,13 +281,13 @@ checklinks: sourcelinks: for i in $(OOBJS) main.o; do \ f=`echo $$i | sed -e 's/\\.o$$//'`.c; \ - $(RMF) $$f; \ + rm -f $$f; \ $(LN_S) $(mcsrcdir)/$$f . || exit 1; \ done cleansourcelinks: -if test -f regex.c; then \ - find . -lname '*.c' | xargs $(RMF); \ + find . -lname '*.c' | xargs rm -f; \ fi check: @@ -296,19 +296,18 @@ check: TAGS: $(GNOMESRCS) etags $(GNOMESRCS) -clean: - $(RMF) plain-gmc corba-gmc *.o core a.out mx $(CORBA_GENERATED) +mostlyclean: + rm -f *.o core a.out mc.keys.in -realclean: clean - $(RMF) .depend - $(RMF) TAGS - $(RMF) *~ +clean: mostlyclean + rm -f plain-gmc corba-gmc gmc-client mx mc.keys \ + $(CORBA_GENERATED) $(MAGICDEV_GENERATED) -distclean: cleansourcelinks - $(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/gmc $(srcdir)/core - $(RMF) $(srcdir)/a.out - -if test $(srcdir) = .; then $(MAKE) realclean; fi - $(RMF) $(srcdir)/Makefile +distclean: clean cleansourcelinks + rm -f .depend + rm -f TAGS + rm -f *~ + rm -f Makefile distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) @@ -338,17 +337,17 @@ install_mx: all $(INSTALL_DATA) $(srcdir)/gmc.gnorba $(DESTDIR)$(corbadir) uninstall: - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc-client - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)plain-gmc + rm -f $(DESTDIR)$(bindir)/$(binprefix)gmc + rm -f $(DESTDIR)$(bindir)/$(binprefix)gmc-client + rm -f $(DESTDIR)$(bindir)/$(binprefix)plain-gmc for I in $(ICONS); \ - do $(RMF) $(DESTDIR)$(icondir)/$$I; done + do rm -f $(DESTDIR)$(icondir)/$$I; done -rmdir $(DESTDIR)$(icondir) - $(RMF) $(DESTDIR)$(mclibdir)/layout - $(RMF) $(DESTDIR)$(datadir)/mime-info/mc.keys + rm -f $(DESTDIR)$(mclibdir)/layout + rm -f $(DESTDIR)$(datadir)/mime-info/mc.keys -rmdir $(DESTDIR)$(datadir)/mime-info -rmdir $(DESTDIR)$(gnewdir) - $(RMF) $(DESTDIR)$(corbadir)/gmc.gnorba + rm -f $(DESTDIR)$(corbadir)/gmc.gnorba -rmdir $(DESTDIR)$(corbadir) depend dep: @gmcdep@ diff --git a/gtkedit/Makefile.in b/gtkedit/Makefile.in index fe41e393d..cf6784e89 100644 --- a/gtkedit/Makefile.in +++ b/gtkedit/Makefile.in @@ -4,7 +4,7 @@ VPATH = @srcdir@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs top_builddir = .. -@MCFG@@MCF@ +@MCF@ CFLAGS = $(XCFLAGS) CPPFLAGS = $(XCPPFLAGS) @GNOME_INCLUDEDIR@ -I$(top_srcdir) @@ -42,42 +42,36 @@ check: @echo no tests are supplied. libgtkedit.a: $(EDITOBJS) - $(RMF) $@ + rm -f $@ $(AR) cr $@ $(EDITOBJS) -$(RANLIB) $@ mcedit: - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit + rm -f $(DESTDIR)$(bindir)/$(binprefix)mcedit $(LN_S) mc $(DESTDIR)$(bindir)/$(binprefix)mcedit showlibdep: @echo 'OBJS="$(EDITOBJS)"' -cross: - $(MAKE) CC=gcc-linux CPP="gcc-linux -E" \ - CPPFLAGS="$(CPPFLAGS) -I/usr/local/lib/gcc-lib/i386-linux-linux/include/ncurses " - TAGS: $(EDITSRC) etags $(EDITSRC) -clean: - $(RMF) *.o core a.out libgtkedit.a +mostlyclean: + rm -f *.o core a.out -realclean: clean - $(RMF) .depend - $(RMF) TAGS - $(RMF) *~ +clean: mostlyclean + rm -f libgtkedit.a -distclean: - $(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out - $(RMF) $(srcdir)/core $(srcdir)/libgtkedit.a - -if test $(srcdir) = .; then $(MAKE) realclean; fi - $(RMF) $(srcdir)/Makefile +distclean: clean + rm -f .depend + rm -f TAGS + rm -f *~ + rm -f Makefile install: @MCEDIT@ uninstall: - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit + rm -f $(DESTDIR)$(bindir)/$(binprefix)mcedit distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) diff --git a/slang/Makefile.in b/slang/Makefile.in index 8676db33f..442fa553a 100644 --- a/slang/Makefile.in +++ b/slang/Makefile.in @@ -4,7 +4,7 @@ VPATH = @srcdir@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs top_builddir = .. -@MCFG@@MCF@ +@MCF@ CFLAGS = $(XCFLAGS) CPPFLAGS = $(XCPPFLAGS) @@ -41,33 +41,27 @@ check: @echo no tests are supplied. libmcslang.a: $(SLANGOBJS) - $(RMF) $@ + rm -f $@ $(AR) cr $@ $(SLANGOBJS) -$(RANLIB) $@ showlibdep: @echo 'OBJS="$(SLANGOBJS)"' -cross: - $(MAKE) CC=gcc-linux CPP="gcc-linux -E" \ - CPPFLAGS="$(CPPFLAGS) -I/usr/local/lib/gcc-lib/i386-linux-linux/include/ncurses " - TAGS: $(SLANGSRCS) etags $(SLANGSRCS) -clean: - $(RMF) *.o core a.out libmcslang.a +mostlyclean: + rm -f *.o core a.out -realclean: clean - $(RMF) .depend slang.h - $(RMF) TAGS - $(RMF) *~ +clean: mostlyclean + rm -f libmcslang.a -distclean: - $(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/core $(srcdir)/a.out - $(RMF) $(srcdir)/libmcslang.a - -if test $(srcdir) = .; then $(MAKE) realclean; fi - $(RMF) $(srcdir)/Makefile +distclean: clean + rm -f .depend slang.h + rm -f TAGS + rm -f *~ + rm -f Makefile distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) diff --git a/src/Makefile.in b/src/Makefile.in index 61c4d389b..1768437d7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -5,7 +5,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs top_builddir = .. SHELL = @SHELL@ -@MCFG@@MCF@ +@MCF@ CFLAGS = $(XCFLAGS) @MCCFLAGS@ CPPFLAGS = $(XCPPFLAGS) -DREGEX_MALLOC @@ -83,8 +83,8 @@ $(srcdir)/mc.hlp: @MAINT@ $(docdir)/mc.1.in $(mcsrclibdir)/xnc.hlp $(srcdir)/gin @MAINT@ $(MAKE) man2hlp @MAINT@ - ./man2hlp 58 $(docdir)/mc.1.in | cat - $(mcsrclibdir)/xnc.hlp | \ @MAINT@ perl $(srcdir)/gindex.pl > $(srcdir)/mc.hlp.tmp && \ -@MAINT@ $(MV) -f $(srcdir)/mc.hlp.tmp $(srcdir)/mc.hlp; \ -@MAINT@ $(RMF) $(srcdir)/mc.hlp.tmp; \ +@MAINT@ mv -f $(srcdir)/mc.hlp.tmp $(srcdir)/mc.hlp; \ +@MAINT@ rm -f $(srcdir)/mc.hlp.tmp; \ @MAINT@ touch $(srcdir)/mc.hlp mc.html: $(docdir)/mc.1.in man2hlp @@ -95,20 +95,17 @@ mc.html: $(docdir)/mc.1.in man2hlp TAGS: $(SRCS) etags $(SRCS) -clean: - $(RMF) mc cons.saver man2hlp *.o core a.out mc.html mcmfmt +mostlyclean: + rm -f *.o core a.out -realclean: clean - $(RMF) .depend - $(RMF) TAGS - $(RMF) *~ +clean: mostlyclean + rm -f mc cons.saver man2hlp mc.html mcmfmt -distclean: - $(RMF) $(srcdir)/*~ $(srcdir)/mc $(srcdir)/cons.saver - $(RMF) $(srcdir)/man2hlp $(srcdir)/*.o $(srcdir)/core - $(RMF) $(srcdir)/a.out $(srcdir)/mc.html - -if test $(srcdir) = .; then $(MAKE) realclean; fi - $(RMF) $(srcdir)/Makefile +distclean: clean + rm -f .depend + rm -f TAGS + rm -f *~ + rm -f Makefile install: mc mcmfmt @saver@ $(INSTALL_PROGRAM) mc $(DESTDIR)$(bindir)/$(binprefix)mc @@ -119,10 +116,10 @@ install.saver: cons.saver $(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver uninstall: - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)/mc - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)/mcmfmt - $(RMF) $(DESTDIR)$(suppbindir)/cons.saver - $(RMF) $(DESTDIR)$(mclibdir)/$(libprefix)/mc.hlp + rm -f $(DESTDIR)$(bindir)/$(binprefix)/mc + rm -f $(DESTDIR)$(bindir)/$(binprefix)/mcmfmt + rm -f $(DESTDIR)$(suppbindir)/cons.saver + rm -f $(DESTDIR)$(mclibdir)/$(libprefix)/mc.hlp distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) diff --git a/vfs/Make-mc.in b/vfs/Make-mc.in index c2f4135de..5f0235250 100644 --- a/vfs/Make-mc.in +++ b/vfs/Make-mc.in @@ -8,7 +8,7 @@ VPATH = @srcdir@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs top_builddir = .. -@MCFG@@MCF@ +@MCF@ CFLAGS = $(XCFLAGS) -D_LARGEFILE64_SOURCE CPPFLAGS = $(XCPPFLAGS) -I. -I$(srcdir)/samba/ubiqx -I$(srcdir)/samba/smbwrapper @@ -222,6 +222,7 @@ Makefile: $(srcdir)/Make-mc.in $(top_builddir)/config.status DISTVFS = Make-mc.in ChangeLog $(VFSSRCS) $(VFSHDRS) callback.h README README.fish all: @LIBVFS@ @mcserv@ + (cd extfs; $(MAKE) all) .c.o: $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< @@ -243,34 +244,34 @@ $(SAMBAFILES): cd samba && $(MAKE) libvfs-mc.a: $(VFSOBJS) @SAMBAFILES@ - $(RMF) $@ + rm -f $@ $(AR) cr $@ $(VFSOBJS) @SAMBAFILES@ -$(RANLIB) $@ showlibdep: @echo 'OBJS="$(VFSOBJS)"' -cross: - $(MAKE) CC=gcc-linux CPP="gcc-linux -E" \ - CPPFLAGS="$(CPPFLAGS) -I/usr/local/lib/gcc-lib/i386-linux-linux/include/ncurses " - TAGS: $(VFSSRCS) etags $(VFSSRCS) -clean: - $(RMF) mcserv *.o core a.out *.a $(SRC_LINKS) +mostlyclean: + (cd extfs; $(MAKE) mostlyclean) + rm -f $(SAMBAFILES) + rm -f *.o core a.out -realclean: clean - $(RMF) .depend - $(RMF) TAGS - $(RMF) *~ +clean: mostlyclean + (cd extfs; $(MAKE) clean) + (cd samba; $(MAKE) clean) + rm -f mcserv *.a -distclean: - $(RMF) $(srcdir)/*~ $(srcdir)/mcserv $(srcdir)/*.o $(srcdir)/a.out - $(RMF) $(srcdir)/core $(srcdir)/libvfs-mc.a +distclean: clean (cd extfs; $(MAKE) distclean) - -if test $(srcdir) = .; then $(MAKE) realclean; fi - $(RMF) $(srcdir)/Makefile + (cd samba; $(MAKE) distclean) + rm -f $(SRC_LINKS) + rm -f .depend + rm -f TAGS + rm -f *~ + rm -f Makefile install: install_@mcserv@ install.extfs @@ -285,7 +286,7 @@ install.extfs: uninstall: (cd extfs; $(MAKE) uninstall) - $(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcserv + rm -f $(DESTDIR)$(bindir)/$(binprefix)mcserv distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)