1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-18 10:16:51 +00:00
Commit Graph

189 Commits

Author SHA1 Message Date
Glenn Morris
97efb62959 Move LIBS_SYSTEM from cpp to configure.
* configure.in (LIBS_SYSTEM): New output variable, replacing cpp.

* lib-src/Makefile.in (LIBS_SYSTEM) [!MSDOS]: Set with configure, not cpp.
(LIBS_SYSTEM) [MSDOS]: Use MSDOS_LIBS_SYSTEM.
(NOT_C_CODE): Remove, no longer used.
(config.h) [!MSDOS]: No longer include.
(LOADLIBES): Use LIBS_SYSTEM as a variable.

* src/Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.
(LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM.
(LIBES): Use LIBS_SYSTEM as a variable.
* src/s/msdos.h (LIBS_SYSTEM): Rename to MSDOS_LIBS_SYSTEM.  Always define.
* src/s/aix4-2.h (LIBS_SYSTEM):
* src/s/freebsd.h (LIBS_SYSTEM):
* src/s/hpux10-20.h (LIBS_SYSTEM):
* src/s/sol2-6.h (LIBS_SYSTEM):
* src/s/unixware.h (LIBS_SYSTEM):
Move to configure.

* msdos/sed1v2.inp, msdos/sed3v2.inp (LIBS_SYSTEM): Edit to empty.
2010-05-09 19:16:09 -07:00
Glenn Morris
7490175bc3 Move MAIL_USE_FLOCK, MAIL_USE_LOCKF, BLESSMAIL_TARGET from cpp to configure.
* configure.in (MAIL_USE_FLOCK, MAIL_USE_LOCKF): New AC_DEFINEs.
(BLESSMAIL_TARGET): New output variable.

* lib-src/Makefile.in (BLESSMAIL_TARGET): Set with configure, not cpp.

* src/s/aix4-2.h (MAIL_USE_LOCKF):
* src/s/bsd-common.h (MAIL_USE_FLOCK):
* src/s/darwin.h (MAIL_USE_FLOCK):
* src/s/gnu-linux.h (MAIL_USE_FLOCK):
* src/s/irix6-5.h (MAIL_USE_FLOCK):
* src/s/template.h (MAIL_USE_FLOCK):
Move to configure.

* src/s/ms-w32.h: Comment.

* msdos/sed3v2.inp (BLESSMAIL_TARGET): Edit to need-blessmail.
2010-05-09 17:07:47 -07:00
Glenn Morris
7b42b29f3d Remove unused Makefile definition THIS_IS_MAKEFILE.
* src/Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
* lib-sc/Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
* admin/CPP-DEFINES (THIS_IS_MAKEFILE): Remove.
2010-05-07 19:11:06 -07:00
Glenn Morris
f6c0ee20ba Minimize blessmail-related cpp usage, with an eye to future removal.
* lib-src/Makefile.in: (BLESSMAIL_TARGET): New variable.
(MOVEMAIL_NEEDS_BLESSING): Remove, replace by above variable.
(blessmail): Always define this rule.
(need-blessmail): New rule, split out from maybe-blessmail.
(maybe-blessmail): Use BLESSMAIL_TARGET.
2010-05-06 01:03:27 -07:00
Glenn Morris
496287859b Move C_SWITCH_MACHINE, C_SWITCH_SYSTEM from cpp to autoconf.
* configure.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM): New output
variables, replacing c_switch_machine, c_switch_system.

* src/s/aix4-2.h (C_SWITCH_SYSTEM):
* src/m/alpha.h (C_SWITCH_MACHINE):
Move to configure.in.
* src/Makefile.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM):
New variables, set by configure.
(ALL_CFLAGS): Use $C_SWITCH_MACHINE and $C_SWITCH_SYSTEM in place of
$c_switch_machine and $c_switch_system.

* lib-src/Makefile.in: Use @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@
rather than @c_switch_system@, @c_switch_machine@.
2010-05-03 19:56:19 -07:00
Dan Nicolaescu
10ccb130e0 * Makefile.in (LIBS_MACHINE): Remove, unused. 2010-04-26 11:23:01 -07:00
Dan Nicolaescu
7e10844c72 * Makefile.in (LIBS_MACHINE): Remove, unused.
* Makefile.in (LIBS_MACHINE): Remove all uses, unused.
* configure.in (LIBS_MACHINE): Remove, unused.
2010-04-26 11:14:24 -07:00
Dan Nicolaescu
4794a58232 * Makefile.in (ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Move to the
non-cpp section.
2010-04-12 07:38:42 -07:00
Dan Nicolaescu
76bd82023f Use autoconf, not cpp for some variables.
* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
(C_SWITCH_X_SITE): Define using autoconf.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
(C_SWITCH_X_SITE): Define using autoconf.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Define using
autoconf, not cpp.
(ALL_CFLAGS): Use them as make variables.
2010-04-11 13:17:24 -07:00
Glenn Morris
5e58e3a4f7 Cosmetic changes to lib-src/Makefile.in.
* Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(LIBHESIOD, LIBRESOLV): Make previous change a bit more friendly by
defining these as Makefile variables.
(LIBS_MOVE): Add LIBS_MAIL into this.
(movemail${EXEEXT}): Just use LIBS_MOVE, not LIBS_MAIL as well.
2010-03-20 11:13:46 -07:00
Glenn Morris
aded53ff76 Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.

* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).

* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-17 22:49:31 -07:00
Tetsurou Okazaki
f838857030 Close bug#5720.
* Makefile.in, lib-src/Makefile.in (uninstall): Handle the case where
archlibdir does not exist.
2010-03-17 22:17:11 -07:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Glenn Morris
c5a139ca22 ($(DESTDIR)${archlibdir}): Set umask to world-readable before creating
directories and game score files.
2009-09-09 02:32:25 +00:00
Glenn Morris
a8a8ec612e (UTILITIES): Remove cvtmail.
(cvtmail${EXEEXT}): Remove.
2009-08-19 02:56:12 +00:00
Dan Nicolaescu
f5f20f6c67 (movemail.o): Don't pass -Demacs, unused. 2009-06-23 06:45:39 +00:00
Adrian Robert
fa44da6ea6 * mac-fix-env.m: * Makefile.in (mac-fix-env): Remove. 2009-06-09 01:55:02 +00:00
Adrian Robert
a7f2b0b17e Makefile.in (mac-fix-env): Compile it using ALL_CFLAGS. 2009-06-07 03:50:01 +00:00
Glenn Morris
f5d0ac07d6 Add 2009 to copyright years. 2009-01-08 03:38:51 +00:00
Dan Nicolaescu
48fad8e894 * s/darwin.h (OTHER_FILES): Do not define here, defined in
config.in.

* Makefile.in (ALL_OBJC_CFLAGS): New variable.
(.m.o): Use it.
* config.in: Regenerate.

* Makefile.in (INSTALLABLES): Add LIB_SRC_EXTRA_INSTALLABLES.  Do
not special case for NS_IMPL_COCOA.

* configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable.
AC_SUBST it.
(GNU_OBJC_CFLAGS): Define as a shell variable instead of #define.
AC_SUBST it.
(OTHER_FILES): Always define for HAVE_NS.
(C_SWITCH_X_SYSTEM): Don't define as empty for NS_IMPL_COCOA.
* configure: Regenerate.
2008-08-07 14:21:43 +00:00
Adrian Robert
f4494e843f * Makefile.in (CFLAGS): Drop -universal under NS_IMPL_COCOA. (.m.o): Dispense with GNUstep-specific flags. 2008-08-06 16:18:35 +00:00
Dan Nicolaescu
7f619bab3e (mac-fix-env): Remove #ifdef around rule. 2008-07-21 17:05:37 +00:00
Andreas Schwab
32cc392575 * s/cygwin.h (LIB_STANDARD_LIBSRC): Don't define.
* Makefile.in (INSTALL_SCRIPT): Remove duplicate definition.
(LIB_STANDARD_LIBSRC): Don't define.
(LOADLIBES): Remove LIB_STANDARD_LIBSRC.
2008-07-17 10:53:02 +00:00
Adrian Robert
122e9f8f29 various small cleanups detailed in changelogs 2008-07-16 23:24:46 +00:00
Adrian Robert
edfda78355 merging Emacs.app (NeXTstep port) 2008-07-15 18:15:18 +00:00
Glenn Morris
294981c77c Switch to recommended form of GPLv3 permissions notice. 2008-05-09 23:19:13 +00:00
Glenn Morris
63b9b6057f Adam Go biowski <adamg at pld-linux.org> (tiny change)
(etags${EXEEXT}, ctags${EXEEXT}): Fix quote typo.
2008-04-24 05:39:19 +00:00
Dan Nicolaescu
9d2818d676 * configure.in: Remove references to obsolete variables and
systems.
* configure: Regenerate.

* Makefile.in (NO_SHORTNAMES):
* emacsclient.c (NO_SHORTNAMES):
* fakemail.c (NO_SHORTNAMES):
* make-docfile.c (NO_SHORTNAMES):
* movemail.c (NO_SHORTNAMES):
* pop.c (NO_SHORTNAMES): Remove references to obsolete variable.

* config.nt (SHORTNAMES): Remove reference to obsolete variable.

* s/vms4-0.h:
* s/vms4-2.h:
* s/vms4-4.h:
* s/vms5-5.h: Remove, unused.

* s/irix5-2.h:
* s/irix6-0.h:
* s/riscos5.h:
* s/mach-bsd4-3.h:
* m/mips4.h: Remove files for obsolete systems

* Makefile.in:
* filelock.c:
* unexmips.c:
* m/hp9000s300.h:
* m/iris4d.h:
* s/aix3-1.h:
* s/hpux.h:
* s/msdos.h:
* s/usg5-0.h:
* s/usg5-2-2.h:
* s/usg5-2.h:
* s/usg5-3.h: Remove references to obsolete variables.

* s/irix5-0.h: Remove, move all the contents ...
* s/irix6-5.h: ... here.  Simplify.
* config.in: Regenerate.
2008-02-24 18:53:07 +00:00
Dan Nicolaescu
deeaffe11d * Makefile.in (REGEXP_IN_LIBC): Remove reference to obsolete
variable.

* s/gnu-linux.h: Remove commented out code.

* unexec.c: Remove references to obsolete variable
COFF_ENCAPSULATE.

* Makefile.in: Update what RMS says about using autoconf.
(C_COMPILER):
(COFF_ENCAPSULATE):
(MAKE_PARALLEL): Remove obsolete variable.
(C_SWITCH_MACHINE_1, C_SWITCH_SYSTEM_1, C_SWITCH_SITE_1):
(C_SWITCH_X_SITE_1, C_SWITCH_X_MACHINE_1)
(C_SWITCH_X_SYSTEM_1): Move invariant code outside conditional.
2008-02-09 07:42:06 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
a5b68355b3 Add 2008 to copyright years. 2008-01-07 08:42:46 +00:00
Glenn Morris
303dba99e6 Remove broken end-of-file comment. 2007-10-06 01:45:50 +00:00
Glenn Morris
3bfe5b54f9 (emacstool, nemacstool, xvetool, xveterm): Delete targets built from
emacstool.
2007-09-21 03:41:38 +00:00
Glenn Morris
5857323043 (SOURCES, unlock, relock): Delete. 2007-09-12 06:54:54 +00:00
Eli Zaretskii
ca4ea90fa9 (rcs2log, rcs-checkin, grep-changelog, vcdiff): Prepend "-" to the command,
in case srcdir=. and file is copied into itself.
2007-08-25 10:59:32 +00:00
Glenn Morris
4a9f99bdfb Switch license to GPLv3 or later. 2007-07-25 05:08:27 +00:00
Francesco Potortì
46861ec00b (etags, ctags): define EMACS_NAME as "GNU Emacs". 2007-02-26 13:21:16 +00:00
Glenn Morris
70e48c8616 Ulrich Mueller <ulm at kph.uni-mainz.de> (tiny change):
(EMACS, EMACSOPT): New variables.
(blessmail): Use `--no-site-file' when compiling.
2007-02-20 04:08:17 +00:00
Glenn Morris
b3d90e4611 Update copyright for years from Emacs 21 to present (mainly adding
2001).
2007-01-16 03:47:24 +00:00
Ramprasad B
01c7d38339 Installed [mark@mcs.vuw.ac.nz: use INSTALL_SCRIPT in lib-src] patch 2006-11-03 14:10:50 +00:00
Eli Zaretskii
8c09ed8296 (UTILITIES): Remove yow${EXEEXT}.
yow${EXEEXT}: Remove target.
2006-06-09 17:53:58 +00:00
Eli Zaretskii
81af906074 Add DESTDIR variable to install and uninstall targets to support staged
installations.
2006-03-03 12:02:31 +00:00
Thien-Thi Nguyen
273dc16aaf Update years in copyright notice; nfc. 2006-02-06 11:28:28 +00:00
Richard M. Stallman
30cfcf7fb0 (update-game-score.o): Delete spurious final `\'. 2005-12-22 16:18:46 +00:00
Richard M. Stallman
f85d3f3fd8 (update-game-score.o): New target.
Compile and link this progranm separately.
(update-game-score${EXEEXT}): Use GETOPTDEPTS.
2005-09-15 13:08:01 +00:00
Thien-Thi Nguyen
92b47a4a99 Update years in copyright notice; nfc. 2005-08-07 10:56:27 +00:00
Paul Eggert
9eff9fe3e8 Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory.  Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.

* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).

* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.

* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
Lute Kamstra
364c38d3af Update FSF's address. 2005-07-04 15:47:28 +00:00
Miles Bader
48d67035ea Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396
Tweak arch tagging to make build/install-in-place less annoying

Previously, autoconf-created Makefiles and the like would contain
duplicate taglines (unfortunately, autoconf doesn't seem to have a
`strip in generated file' comment mechanism) leading to conflicts, and
installing in place would create unknown directories and copies of
source directories (leading to conflicts with the source directories).

This changeset makes all autoconf-processed files use explicit id-tags
and adds .arch-inventory entries to ignore installation directories.
2004-06-11 02:39:51 +00:00
Thien-Thi Nguyen
c2bcfb19fb (emacsclient${EXEEXT}): Use makefile var `version'. 2004-05-08 14:42:41 +00:00