diff --git a/ChangeLog b/ChangeLog index 0d5151462..a6e8cb502 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2001-05-27 Pavel Roskin + * Make.common.in: Remove all percent rules. + * acinclude.m4 (AC_PROG_GNU_MAKE): Remove. + * configure.in: Remove AC_PROG_GNU_MAKE. Don't substitute + PCENTRULE. Remove AC_PROG_MAKE_SET - it's called by + AM_INIT_AUTOMAKE. + * Make.common.in: Remove obsolete dependency tracking system. * configure.in: Likewise. * edit/Makefile.in: Likewise. diff --git a/Make.common.in b/Make.common.in index 6a84356a1..a4afa5ef1 100644 --- a/Make.common.in +++ b/Make.common.in @@ -2,13 +2,6 @@ VERSION = @VERSION@ SHELL = @SHELL@ -# This variable makes it possible to move the installation root to another -# directory. This is useful when you're creating a binary distribution of mc. -# If empty, normal root will be used. -# You can run e.g. 'make install DESTDIR=/packages/mc/5.0' to accomplish -# that. -# DESTDIR = /opt/apps/mc/$(VERSION) - # Installation target directories & other installation stuff prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -84,15 +77,9 @@ first_rule: all .PHONY: all check cross TAGS clean install uninstall distcopy depend -@PCENTRULE@../slang/%.o : ../slang/%.c -@PCENTRULE@ cd ../slang; $(MAKE) libmcslang.a - -@PCENTRULE@../vfs/%.o : ../vfs/%.c -@PCENTRULE@ cd ../vfs; $(MAKE) libvfs.a - dummy: -# Added for compatability with Automake +# Added for compatibility with Automake dvi: installcheck: diff --git a/acinclude.m4 b/acinclude.m4 index defc287a2..c6a292304 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -430,31 +430,6 @@ fi rm -f conftest*] ) -dnl Find if make is GNU make. -AC_DEFUN([AC_PROG_GNU_MAKE], -[AC_MSG_CHECKING([whether we are using GNU make]) -set dummy ${MAKE-make}; ac_make=[$]2 -AC_CACHE_VAL(ac_cv_prog_gnu_make, -[cat > conftestmake <<\EOF -all: - @echo ' ' -EOF -if ${MAKE-make} --version -f conftestmake 2>/dev/null | grep GNU >/dev/null 2>&1; then - ac_cv_prog_gnu_make=yes -else - ac_cv_prog_gnu_make=no -fi -rm -f conftestmake])dnl -if test $ac_cv_prog_gnu_make = yes; then - AC_MSG_RESULT(yes) - GNU_MAKE="GNU_MAKE=yes" -else - AC_MSG_RESULT(no) - GNU_MAKE= -fi -AC_SUBST([GNU_MAKE])dnl -]) - AC_DEFUN([AC_USE_SUNOS_CURSES], [ search_ncurses=false screen_manager="SunOS 4.x /usr/5include curses" diff --git a/configure.in b/configure.in index f737421ee..795746b03 100644 --- a/configure.in +++ b/configure.in @@ -9,13 +9,11 @@ AM_INIT_AUTOMAKE(mc, 4.5.54) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE -AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP AC_PROG_RANLIB AC_PROG_LN_S AC_PROG_AWK -AC_PROG_GNU_MAKE AC_AIX AC_MINIX @@ -911,21 +909,9 @@ AC_SUBST(MCCPPFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(LIBS) -ac_cv_make_with_percent_rules=no -if test x$ac_cv_prog_gnu_make = xyes; then - ac_cv_make_with_percent_rules=yes -fi - MCF=./Make.common AC_SUBST_FILE(MCF) -if test x$ac_cv_make_with_percent_rules = xyes; then - PCENTRULE="" -else - PCENTRULE="#" -fi -AC_SUBST(PCENTRULE) - dnl dnl Output configuration files dnl