diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-05-09 22:51:16 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-05-09 22:51:16 +0000 |
| commit | b6472fc16bba795fc499314f8264c3518945bfa0 (patch) | |
| tree | e3734558efe53674753741377aaf0ebe85adcf4e /Makefile.in | |
| parent | 679f7f7eb7b62b477125399f8d6a69d2153a00df (diff) | |
| download | emacs-b6472fc16bba795fc499314f8264c3518945bfa0.tar.gz | |
* Makefile.in (DEFS): Deleted; since we're using AC_CONFIG_HEADER,
this is always just -DHAVE_CONFIG_H.
The GNU coding standards specify that CFLAGS should be left for
users to set.
* Makefile.in (CFLAGS): Let configure determine the default value
for this. Don't
have it default to DEFS.
(${SUBDIR}): Pass CFLAGS down to submakes, not DEFS.
(lib-src/Makefile, src/Makefile): Edit the default value for
CFLAGS into these files, not DEFS.
* configure.in (CFLAGS): Choose a default value for this - "-g"
normally, or "-g -O" if we're using GCC. Edit it into the
top-level Makefile.
* configure.in: Add AC_LN_S test, so we can tell whether or not we
can use a symbolic link to get the X Menu library into src.
* Makefile.in (LN_S): New variable.
(src/Makefile): Edit the value of LN_S into this makefile.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 2ab87a8bfca..97655d34653 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,9 +41,10 @@ MAKE = make # BSD doesn't have it as a default. # ==================== Things `configure' Might Edit ==================== CC=@CC@ -DEFS=@DEFS@ C_SWITCH_SYSTEM=@c_switch_system@ ALLOCA=@ALLOCA@ +LN_S=@LN_S@ +CFLAGS=@CFLAGS@ ### These help us choose version- and architecture-specific directories ### to install files in. @@ -195,8 +196,6 @@ INSTALL_DATA = ${INSTALL} # Flags passed down to subdirectory makefiles. MFLAGS = -CFLAGS=${DEFS} - # Subdirectories to make recursively. `lisp' is not included # because the compiled lisp files are part of the distribution # and you cannot remake them without installing Emacs first. @@ -241,7 +240,7 @@ src: lib-src ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC cd $@; $(MAKE) all ${MFLAGS} \ - CC='${CC}' DEFS='${DEFS}' \ + CC='${CC}' CFLAGS='${CFLAGS}' \ srcdir='${srcdir}/$@' libdir='${libdir}' ## We build the makefiles for the subdirectories here so that we can @@ -266,7 +265,7 @@ lib-src/Makefile: ${srcdir}/lib-src/Makefile.in Makefile -e 's|^\(archlibdir *=\).*$$|\1'"${archlibdir}"'|' \ -e 's|^\(ALLOCA *=\).*$$|\1'"${ALLOCA}"'|' \ -e 's|^CC *=.*$$|CC='"${CC}"'|' \ - -e 's|^DEFS *=.*$$|DEFS='"${DEFS}"'|' \ + -e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|' \ -e 's|^C_SWITCH_SYSTEM *=.*$$|C_SWITCH_SYSTEM='"${C_SWITCH_SYSTEM}"'|' \ -e 's|^LOADLIBES *=.*$$|LOADLIBES='"${libsrc_libs}"'|' \ -e '/^# DIST: /d') > lib-src/Makefile.tmp @@ -284,7 +283,8 @@ src/Makefile: ${srcdir}/src/Makefile.in Makefile /bin/sed < ${srcdir}/src/Makefile.in \ -e 's|^\(srcdir *=\).*$$|\1'"${srcdir}"'|' \ -e 's|^CC *=.*$$|CC='"${CC}"'|' \ - -e 's|^DEFS *=.*$$|DEFS='"${DEFS}"'|' \ + -e 's|^LN_S *=.*$$|LN_S='"${LN_S}"'|' \ + -e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|' \ -e '/^# DIST: /d') > src/Makefile.tmp @${srcdir}/move-if-change src/Makefile.tmp src/Makefile chmod -w src/Makefile |