diff --git a/ChangeLog b/ChangeLog index 7e984e9cc..1c8e52ddc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2000-08-24 Pavel Roskin + * Makefile.in, doc-gnome/Makefile.in, pc/Makefile: converted + to ... + * Makefile.am, doc-gnome/Makefile.am, pc/Makefile.am: ... this + * Make.common.in: support for "distdir" for compatability + with Automake-generated makefiles + * autogen.sh: run automake. Force cache - it is off by default + in autoconf 2.49a, but it's still handy for maintainers + * configure.in: adapted for Automake + * AUTHORS: new file 2000-08-23 Pavel Roskin diff --git a/Make.common.in b/Make.common.in index e5fe66216..a358eb8d1 100644 --- a/Make.common.in +++ b/Make.common.in @@ -110,6 +110,8 @@ slowdep: dummy mcdep: @dep@ +distdir: distcopy + dummy: # End of Make.common diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 000000000..380fe1b0a --- /dev/null +++ b/Makefile.am @@ -0,0 +1,17 @@ +## Process this file with automake to create Makefile.in. + +SUBDIRS = vfs lib doc slang gtkedit edit src gnome new_icons \ + icons idl syntax intl doc-gnome po pc + +ACLOCAL_AMFLAGS = -I macros + +GNOME_M4_FILES = macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 \ + macros/linger.m4 + +EXTRA_DIST = BUGS FAQ INSTALL.FAST MAINTAINERS \ + README.PC README.QNX README.smbfs \ + create_vcs mc-aclocal.m4 gettext.m4 \ + $(GNOME_M4_FILES) + +dist-hook: + cp mc.spec $(distdir) diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 433abc1ce..000000000 --- a/Makefile.in +++ /dev/null @@ -1,144 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -rootdir = $(srcdir) -@MCFGR@@MCF@ - -foreigndirs=pc -codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax -unixdirs=intl $(codedirs) doc-gnome @POSUB@ -alldirs=$(unixdirs) $(foreigndirs) -subdirs=$(alldirs) - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -DISTMAIN = configure configure.in NEWS README INSTALL INSTALL.FAST \ - Makefile.in FAQ COPYING create_vcs install-sh \ - config.h.in mc-aclocal.m4 aclocal.m4 acconfig.h \ - mcfn_install.in Make.common.in README.PC \ - mc.spec.in README.QNX MAINTAINERS \ - mkinstalldirs ABOUT-NLS gettext.m4 BUGS ChangeLog\ - config.guess config.sub README.smbfs - -all: - @for dir in @INTLSUB@ ${codedirs} @POSUB@; do \ - (cd $$dir; ${MAKE} all) || exit 1; \ - done - -static: - $(MAKE) _LDFLAGS="-static $(_LDFLAGS)" - -configure: configure.in aclocal.m4 - chmod 755 configure - -GNOME_M4_FILES = macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 \ - macros/linger.m4 - -aclocal.m4: mc-aclocal.m4 $(GNOME_M4_FILES) gettext.m4 - cd $(srcdir); cat $(GNOME_M4_FILES) mc-aclocal.m4 gettext.m4 > aclocal.m4 - -config.h.in: configure.in acconfig.h - cd $(srcdir); autoheader - -install: installdirs - @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done - $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ - $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install - chmod +x $(DESTDIR)$(suppbindir)/mcfn_install - @echo "Please verify that the configuration values are correctly" - @echo "set in the mc.ext file in $(mclibdir)" - -install.create_vcs: - $(INSTALL_PROGRAM) $(srcdir)/create_vcs $(DESTDIR)$(suppbindir)/create_vcs - if test x$(DESTDIR) = x; then $(SHELL) $(srcdir)/create_vcs; fi - -installdirs: - $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir) - $(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir) - $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir) - $(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir) - $(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir) - -mcfninstall: - -/bin/sh ./mcfn_install - -uninstall: - @for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done - $(RMF) $(DESTDIR)$(mclibdir)/FAQ - $(RMF) $(DESTDIR)$(suppbindir)/mcfn_install - -rmdir $(DESTDIR)$(suppbindir) - -rmdir $(DESTDIR)$(mclibdir) - @echo Midnight Commander uninstalled - -cross TAGS clean depend dep: - @for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done - cd vfs/samba && $(MAKE) $@ - -Makefile: Makefile.in config.status - CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) config.status - -config.status: - if test -x config.status; then config.status --recheck; \ - else $(SHELL) configure; fi - -realclean: clean - rm -f *~ - rm -f config.cache - -# distclean goal is for making a clean source tree, but if you have run -# configure from a different directory, then doesn't destroy all your -# hardly compiled and linked stuff. That's why there is always $(srcdir)/ -# In that case most of those commands do nothing, except cleaning *~ -# and cleaning source links. -distclean: - rm -f *~ config.cache config.h - @for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done - rm -f Makefile Make.common - rm -f lib/mc.ext mcfn_install - rm -f config.log config.status - cd vfs/samba && $(MAKE) $@ - -distcopy: - rm -rf $(top_srcdir)/mc-$(VERSION) - mkdir $(top_srcdir)/mc-$(VERSION) - for I in $(DISTMAIN); do cp $(top_srcdir)/$$I $(top_srcdir)/mc-$(VERSION) || cp $$I $(top_srcdir)/mc-$(VERSION); done - for I in $(unixdirs); do \ - mkdir $(top_srcdir)/mc-$(VERSION)/$$I; \ - $(MAKE) -C $$I distcopy VERSION=$(VERSION) PACKAGE=mc || exit 1; \ - done - mkdir $(top_srcdir)/mc-$(VERSION)/macros - for I in $(GNOME_M4_FILES); do cp $(top_srcdir)/$$I $(top_srcdir)/mc-$(VERSION)/macros; done - $(MAKE) || exit 1; cd ..; - cp $(top_srcdir)/po/Makefile.in.in $(top_srcdir)/mc-$(VERSION)/po; - cp $(top_srcdir)/po/POTFILES.in $(top_srcdir)/mc-$(VERSION)/po; - cp $(top_srcdir)/po/*.po $(top_srcdir)/po/*.gmo $(top_srcdir)/po/mc.pot $(top_srcdir)/po/stamp-cat-id $(top_srcdir)/po/cat-id-tbl.c $(top_srcdir)/mc-$(VERSION)/po; - cp mc.spec $(top_srcdir)/mc-$(VERSION)/mc.spec; - (cd $(top_srcdir); tar cvf - mc-$(VERSION) | \ - gzip -f9) > mc-$(VERSION).tar.gz - -dist: configure config.h.in distcopy - @: - -# rm -rf $(top_srcdir)/mc-$(VERSION) mc-$(VERSION) - -mycheck: Makefile - rm -rf mc-$(VERSION) - tar xzvf $(top_srcdir)/mc-$(VERSION).tar.gz - mkdir mc-$(VERSION)/=build - mkdir mc-$(VERSION)/=inst - dc_install_base=`cd mc-$(VERSION)/=inst && pwd`; \ - cd mc-$(VERSION)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) \ - && make install - -rm -rf mc-$(VERSION) - -mydistcheck: dist mycheck - @echo *********************************** - @echo mc-$(VERSION) is ready for release - @echo *********************************** - -distcheck: - @echo use mydistcheck only if you know what you are doing. diff --git a/autogen.sh b/autogen.sh index 93ef9576d..f22a5358f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,10 +18,11 @@ else fi fi autoheader || exit 1 -autoconf || exit 1 +autoconf || exit 1 +automake -a || exit 1 cd vfs/samba || exit 1 autoheader || exit 1 autoconf || exit 1 ) || exit 1 -$srcdir/configure --enable-maintainer-mode $* +$srcdir/configure --cache-file=config.cache --enable-maintainer-mode "$@" diff --git a/configure.in b/configure.in index 8102c9863..fbe1cf3b8 100644 --- a/configure.in +++ b/configure.in @@ -2,14 +2,9 @@ dnl dnl Configure.in file for the Midnight Commander dnl AC_INIT(create_vcs) -AC_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE(mc, 4.5.51) +AM_CONFIG_HEADER(config.h) -PACKAGE=mc -VERSION=4.5.51 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") -AC_SUBST(VERSION) -AC_SUBST(PACKAGE) top_srcdir=`dirname $0` AC_SUBST(top_srcdir) @@ -1262,6 +1257,7 @@ gtkedit/Makefile syntax/Makefile new_icons/Makefile icons/Makefile +pc/Makefile lib/mc.ext lib/mc-gnome.ext diff --git a/doc-gnome/Makefile.am b/doc-gnome/Makefile.am new file mode 100644 index 000000000..42ffacc26 --- /dev/null +++ b/doc-gnome/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = C diff --git a/doc-gnome/Makefile.in b/doc-gnome/Makefile.in deleted file mode 100644 index 9137797e5..000000000 --- a/doc-gnome/Makefile.in +++ /dev/null @@ -1,389 +0,0 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = -DISTDOCS = Makefile.in - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -AR = @AR@ -AWK = @AWK@ -AWK_VAR_OPTION = @AWK_VAR_OPTION@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CFLAGS = @CFLAGS@ -CHMOD = @CHMOD@ -CP = @CP@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CURSES_INCLUDEDIR = @CURSES_INCLUDEDIR@ -CURSES_LIBS = @CURSES_LIBS@ -DATADIRNAME = @DATADIRNAME@ -GENCAT = @GENCAT@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_CONFIG = @GLIB_CONFIG@ -GLIB_LIBS = @GLIB_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ -GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ -GNOME_LIBDIR = @GNOME_LIBDIR@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GNU_MAKE = @GNU_MAKE@ -GTKXMHTML_LIBS = @GTKXMHTML_LIBS@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -HAVE_FILECMD = @HAVE_FILECMD@ -HAVE_SLINGSHOT = @HAVE_SLINGSHOT@ -HAVE_nroff = @HAVE_nroff@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLSUB = @INTLSUB@ -LCRYPT = @LCRYPT@ -LDFLAGS = @LDFLAGS@ -LEDIT = @LEDIT@ -LGPM = @LGPM@ -LIBEDIT_A = @LIBEDIT_A@ -LIBS = @LIBS@ -LIBSLANG = @LIBSLANG@ -LIBVFS = @LIBVFS@ -LINTL = @LINTL@ -LN_S = @LN_S@ -LSLANG = @LSLANG@ -LVFS = @LVFS@ -MANDOC = @MANDOC@ -MCCFLAGS = @MCCFLAGS@ -MCCPPFLAGS = @MCCPPFLAGS@ -MCEDIT = @MCEDIT@ -MCFG = @MCFG@ -MCFGR = @MCFGR@ -MCLIBS = @MCLIBS@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MV = @MV@ -NETFILES = @NETFILES@ -ORBIT_CFLAGS = @ORBIT_CFLAGS@ -ORBIT_CONFIG = @ORBIT_CONFIG@ -ORBIT_IDL = @ORBIT_IDL@ -ORBIT_LIBS = @ORBIT_LIBS@ -PACKAGE = @PACKAGE@ -PAMLIBS = @PAMLIBS@ -PCENTRULE = @PCENTRULE@ -PHONY = @PHONY@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -REGEX_O = @REGEX_O@ -RM = @RM@ -SEDCMD = @SEDCMD@ -SEDCMD2 = @SEDCMD2@ -SHADOWLIB = @SHADOWLIB@ -SHELL = @SHELL@ -SLINGSHOT_CFLAGS = @SLINGSHOT_CFLAGS@ -SLINGSHOT_LIBS = @SLINGSHOT_LIBS@ -TERMNET = @TERMNET@ -TROFFASCII = @TROFFASCII@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WRITEDEP = @WRITEDEP@ -X11_WWW = @X11_WWW@ -XCURSES = @XCURSES@ -XPM_LIB = @XPM_LIB@ -ZVT_LIBS = @ZVT_LIBS@ -builddir = @builddir@ -dep = @dep@ -fastdepslang = @fastdepslang@ -fastdepvfs = @fastdepvfs@ -gmcdep = @gmcdep@ -gnomeicondir = @gnomeicondir@ -insticons = @insticons@ -l = @l@ -libgtkedit = @libgtkedit@ -mcserv = @mcserv@ -mx = @mx@ -saver = @saver@ -saver_target = @saver_target@ -system = @system@ -undelfs_o = @undelfs_o@ -vcs = @vcs@ - -SUBDIRS = C -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h -CONFIG_CLEAN_FILES = -HEADERS = - -DIST_COMMON = Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = doc-gnome - -distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc-gnome/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: -install-exec: install-exec-recursive - -install-data-am: -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: -uninstall: uninstall-recursive -all-am: Makefile $(HEADERS) -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -installdirs: installdirs-recursive -installdirs-am: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-tags clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-tags distclean-generic clean-am - -distclean: distclean-recursive - -distcopy: - mkdir $(top_srcdir)/mc-$(VERSION)/doc-gnome/C - $(MAKE) -C C distcopy VERSION=$(VERSION) PACKAGE=mc - for I in $(DISTDOCS); do $(CP) $(top_srcdir)/doc-gnome/$$I $(top_srcdir)/mc-$(VERSION)/doc-gnome; done - -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -.PHONY: install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/pc/Makefile b/pc/Makefile.am similarity index 56% rename from pc/Makefile rename to pc/Makefile.am index 9bcdd7327..3fe90c0c2 100644 --- a/pc/Makefile +++ b/pc/Makefile.am @@ -7,34 +7,11 @@ # the Midnight Commander for Windows NT or OS/2 # -include ../Make.common - -FILES = BUGS Makefile Makefile.BC2 Makefile.BC5 Makefile.EMX \ +EXTRA_DIST = BUGS Makefile.BC2 Makefile.BC5 Makefile.EMX \ Makefile.MIN Makefile.IBM Makefile.PC Makefile.VC4 \ Makefile.RSX README TODO ChangeLog chmod.c config.h \ cons_nt.c cons_os2.c dirent.h dirent_nt.c dirent_os2.c \ drive.c drive.h key_nt.c key_os2.c mc.def mc.rc mc_nt.ico \ mc_os2.ico slint_pc.c trace_nt.c trace_nt.h util_nt.c \ - util_os2.c util_win32.c util_win32.h util_winnt.c - -FILESSYS = sys/param.h sys/time.h - -all: - -TAGS: $(FILES) - etags $(FILES) - -clean realclean distclean cross: - -install: - -uninstall: - -depend dep: - -fastdeploc: - -distcopy: - $(CP) $(FILES) ../../mc-$(VERSION)/pc - -mkdir ../../mc-$(VERSION)/pc/sys - $(CP) $(FILESSYS) ../../mc-$(VERSION)/pc/sys + util_os2.c util_win32.c util_win32.h util_winnt.c \ + sys/param.h sys/time.h