Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
61784fd1
Commit
61784fd1
authored
Jun 09, 2014
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL): New, set by configure
Use throughout where appropriate.
parent
40abffe4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
ChangeLog
ChangeLog
+3
-0
Makefile.in
Makefile.in
+10
-5
No files found.
ChangeLog
View file @
61784fd1
2014-06-10 Glenn Morris <rgm@gnu.org>
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL):
New, set by configure. Use throughout where appropriate.
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
* configure.ac (INFO_EXT, INFO_OPTS): Remove output variables.
* configure.ac (INFO_EXT, INFO_OPTS): Remove output variables.
...
...
Makefile.in
View file @
61784fd1
...
@@ -76,6 +76,11 @@ QUIET_SUBMAKE = MAKELEVEL=0
...
@@ -76,6 +76,11 @@ QUIET_SUBMAKE = MAKELEVEL=0
cache_file
=
@cache_file@
cache_file
=
@cache_file@
CONFIGURE_FLAGS
=
--cache-file
=
$(cache_file)
CONFIGURE_FLAGS
=
--cache-file
=
$(cache_file)
AUTOCONF
=
@AUTOCONF@
AUTOMAKE
=
@AUTOMAKE@
AUTOHEADER
=
@AUTOHEADER@
ACLOCAL
=
@ACLOCAL@
CC
=
@CC@
CC
=
@CC@
CFLAGS
=
@CFLAGS@
CFLAGS
=
@CFLAGS@
LDFLAGS
=
@LDFLAGS@
LDFLAGS
=
@LDFLAGS@
...
@@ -422,17 +427,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
...
@@ -422,17 +427,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
AUTOCONF_INPUTS
=
$(srcdir)
/configure.ac
$(srcdir)
/aclocal.m4
AUTOCONF_INPUTS
=
$(srcdir)
/configure.ac
$(srcdir)
/aclocal.m4
$(srcdir)/configure
:
$(AUTOCONF_INPUTS)
$(srcdir)/configure
:
$(AUTOCONF_INPUTS)
cd
${srcdir}
&&
autoconf
cd
${srcdir}
&&
${AUTOCONF}
ACLOCAL_PATH
=
@ACLOCAL_PATH@
ACLOCAL_PATH
=
@ACLOCAL_PATH@
ACLOCAL_INPUTS
=
$(srcdir)
/configure.ac
$(srcdir)
/m4/gnulib-comp.m4
ACLOCAL_INPUTS
=
$(srcdir)
/configure.ac
$(srcdir)
/m4/gnulib-comp.m4
$(srcdir)/aclocal.m4
:
$(ACLOCAL_INPUTS)
$(srcdir)/aclocal.m4
:
$(ACLOCAL_INPUTS)
cd
$(srcdir)
&&
ACLOCAL_PATH
=
'
$(ACLOCAL_PATH)
'
aclocal
-I
m4
cd
$(srcdir)
&&
ACLOCAL_PATH
=
'
$(ACLOCAL_PATH)
'
$(ACLOCAL)
-I
m4
AUTOMAKE_INPUTS
=
$(srcdir)
/aclocal.m4
$(srcdir)
/lib/Makefile.am
\
AUTOMAKE_INPUTS
=
$(srcdir)
/aclocal.m4
$(srcdir)
/lib/Makefile.am
\
$(srcdir)
/lib/gnulib.mk
$(srcdir)
/lib/gnulib.mk
$(srcdir)/lib/Makefile.in
:
$(AUTOMAKE_INPUTS)
$(srcdir)/lib/Makefile.in
:
$(AUTOMAKE_INPUTS)
cd
$(srcdir)
&&
automake
--gnu
-a
-c
lib/Makefile
cd
$(srcdir)
&&
$(AUTOMAKE)
--gnu
-a
-c
lib/Makefile
# Regenerate files that this makefile would have made, if this makefile
# Regenerate files that this makefile would have made, if this makefile
# had been built by Automake. The name 'am--refresh' is for
# had been built by Automake. The name 'am--refresh' is for
...
@@ -445,9 +450,9 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
...
@@ -445,9 +450,9 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@
# because stamp-h.in has changed
(
since building stamp-h.in
@
# because stamp-h.in has changed
(
since building stamp-h.in
@
# refreshes config.in as well
)
, but
if
config.in is missing
@
# refreshes config.in as well
)
, but
if
config.in is missing
@
# then we really need to do something more.
@
# then we really need to do something more.
[
-r
"
$@
"
]
||
(
cd
${srcdir}
&&
autoheader
)
[
-r
"
$@
"
]
||
(
cd
${srcdir}
&&
${AUTOHEADER}
)
$(srcdir)/src/stamp-h.in
:
$(AUTOCONF_INPUTS)
$(srcdir)/src/stamp-h.in
:
$(AUTOCONF_INPUTS)
cd
${srcdir}
&&
autoheader
cd
${srcdir}
&&
${AUTOHEADER}
rm
-f
$(srcdir)
/src/stamp-h.in
rm
-f
$(srcdir)
/src/stamp-h.in
echo
timestamp
>
$(srcdir)
/src/stamp-h.in
echo
timestamp
>
$(srcdir)
/src/stamp-h.in
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment