mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

* Make.common.in: Remove all percent rules.

Browse Source 
* 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.
This commit is contained in:
Pavel Roskin 2001-05-27 05:53:50 +00:00
parent b0593ec1e2
commit d2134469e8
4 changed files with 7 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2001-05-27 Pavel Roskin <proski@gnu.org> 2001-05-27 Pavel Roskin <proski@gnu.org>
* 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. * Make.common.in: Remove obsolete dependency tracking system.
* configure.in: Likewise. * configure.in: Likewise.
* edit/Makefile.in: Likewise. * edit/Makefile.in: Likewise.

15
Make.common.in
View File

@ -2,13 +2,6 @@ VERSION = @VERSION@
SHELL = @SHELL@ 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 # Installation target directories & other installation stuff
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -84,15 +77,9 @@ first_rule: all
.PHONY: all check cross TAGS clean install uninstall distcopy depend .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: dummy:
# Added for compatability with Automake # Added for compatibility with Automake
dvi: dvi:
installcheck: installcheck:

25
acinclude.m4
View File

@ -430,31 +430,6 @@ fi
rm -f conftest*] 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], [ AC_DEFUN([AC_USE_SUNOS_CURSES], [
search_ncurses=false search_ncurses=false
screen_manager="SunOS 4.x /usr/5include curses" screen_manager="SunOS 4.x /usr/5include curses"

14
configure.in
View File

@ -9,13 +9,11 @@ AM_INIT_AUTOMAKE(mc, 4.5.54)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
AC_PROG_CC AC_PROG_CC
AC_PROG_CPP AC_PROG_CPP
AC_PROG_RANLIB AC_PROG_RANLIB
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_AWK AC_PROG_AWK
AC_PROG_GNU_MAKE
AC_AIX AC_AIX
AC_MINIX AC_MINIX
@ -911,21 +909,9 @@ AC_SUBST(MCCPPFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(LIBS) 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 MCF=./Make.common
AC_SUBST_FILE(MCF) AC_SUBST_FILE(MCF)
if test x$ac_cv_make_with_percent_rules = xyes; then
PCENTRULE=""
else
PCENTRULE="#"
fi
AC_SUBST(PCENTRULE)
dnl dnl
dnl Output configuration files dnl Output configuration files
dnl dnl