* Make.common.in: Remove.
* configure.in: Remove all references to Make.common.in and MCCPPFLAGS. * aclocal.m4: Likewise.
Этот коммит содержится в:
родитель
e777d48dfb
Коммит
22543072c8
@ -1,5 +1,10 @@
|
||||
2001-09-07 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* Make.common.in: Remove.
|
||||
* configure.in: Remove all references to Make.common.in and
|
||||
MCCPPFLAGS.
|
||||
* aclocal.m4: Likewise.
|
||||
|
||||
* configure.in: Require Autoconf 2.52. Remove hacks for
|
||||
Autoconf 2.13.
|
||||
* Makefile.am: Require Automake 1.5.
|
||||
|
@ -1,67 +0,0 @@
|
||||
VERSION = @VERSION@
|
||||
|
||||
SHELL = @SHELL@
|
||||
|
||||
# Installation target directories & other installation stuff
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
binprefix =
|
||||
manprefix =
|
||||
|
||||
bindir = @bindir@
|
||||
sysconfdir = @sysconfdir@
|
||||
datadir = @datadir@
|
||||
libdir = @libdir@
|
||||
mandir = @mandir@
|
||||
mclibdir = $(libdir)/mc
|
||||
suppbindir = $(mclibdir)/bin
|
||||
confdir = $(sysconfdir)
|
||||
localedir = $(datadir)/locale
|
||||
man1dir = $(mandir)/man1
|
||||
manext = 1
|
||||
man8dir = $(mandir)/man8
|
||||
man8ext = 8
|
||||
|
||||
# Tools & program stuff
|
||||
@SET_MAKE@
|
||||
CC = @CC@
|
||||
CPP = @CPP@
|
||||
AR = @AR@
|
||||
RANLIB = @RANLIB@
|
||||
RMF = rm -f
|
||||
MV = mv
|
||||
CP = cp
|
||||
LN_S = @LN_S@
|
||||
AWK = @AWK@
|
||||
|
||||
# Flags & libs
|
||||
# No way, to make make happy (except GNU), we cannot use := to append
|
||||
# something to these, so that's why there is a leading _
|
||||
XCFLAGS = @CFLAGS@
|
||||
XCPPFLAGS = -I.. @CPPFLAGS@ @MCCPPFLAGS@ @GLIB_CFLAGS@
|
||||
XLDFLAGS = @LDFLAGS@
|
||||
XDEFS = @DEFS@
|
||||
XLIBS = @LIBS@
|
||||
|
||||
# Where do we have the sources?
|
||||
# You shouldn't have to edit this :)
|
||||
mcsrcdir = $(top_srcdir)/src
|
||||
docdir = $(top_srcdir)/doc
|
||||
mcsrclibdir = $(top_srcdir)/lib
|
||||
slangdir = $(top_srcdir)/slang
|
||||
vfsdir = $(top_srcdir)/vfs
|
||||
gnomedir = $(top_srcdir)/gnome
|
||||
|
||||
# Rules
|
||||
first_rule: all
|
||||
|
||||
.PHONY: all check cross TAGS clean install uninstall distcopy depend
|
||||
|
||||
dummy:
|
||||
|
||||
# Added for compatibility with Automake
|
||||
dvi:
|
||||
|
||||
installcheck:
|
||||
|
||||
# End of Make.common
|
@ -654,7 +654,6 @@ AC_DEFUN([AC_WITH_SLANG], [
|
||||
[LIBS="$ac_save_LIBS"; AC_USE_TERMINFO],
|
||||
[LIBS="$ac_save_LIBS"; AC_USE_TERMCAP])
|
||||
else
|
||||
MCCPPFLAGS="$MCCPPFLAGS -I\$(slangdir)"
|
||||
LIBSLANG="libmcslang.a"
|
||||
screen_manager="SLang"
|
||||
LSLANG="-lmcslang"
|
||||
|
@ -291,7 +291,6 @@ if test $use_vfs = yes
|
||||
then
|
||||
LIBVFS="libvfs-mc.a"
|
||||
LVFS="-lvfs-mc"
|
||||
MCCPPFLAGS="$MCCPPFLAGS -I\$(vfsdir)"
|
||||
AC_MSG_RESULT([Using the VFS switch code])
|
||||
vfs_type="Midnight Commander Virtual File System"
|
||||
fi
|
||||
@ -809,13 +808,9 @@ LIBS="$LIBS $posix_libs"
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(MCCPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_SUBST(LIBS)
|
||||
|
||||
MCF=./Make.common
|
||||
AC_SUBST_FILE(MCF)
|
||||
|
||||
if test "x$SAMBAFILES" != x; then
|
||||
AC_CONFIG_SUBDIRS([vfs/samba])
|
||||
fi
|
||||
@ -832,7 +827,6 @@ AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
|
||||
AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
|
||||
|
||||
AC_OUTPUT([
|
||||
Make.common
|
||||
Makefile
|
||||
mc.spec
|
||||
doc/Makefile
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user