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
9192d37d
Commit
9192d37d
authored
May 18, 2012
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Makefile.in (SUBDIR): Add leim. Update users.
parent
2e5d41e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
18 deletions
+11
-18
ChangeLog
ChangeLog
+2
-0
Makefile.in
Makefile.in
+9
-18
No files found.
ChangeLog
View file @
9192d37d
2012-05-19 Glenn Morris <rgm@gnu.org>
* Makefile.in (SUBDIR): Add leim. Update users.
* Makefile.in (lib, lib-src, lisp): Check cd return value.
* Makefile.in (leim): No need to set PARALLEL.
...
...
Makefile.in
View file @
9192d37d
...
...
@@ -258,14 +258,8 @@ TRANSFORM = @program_transform_name@
EMACS
=
`
echo
emacs
${EXEEXT}
|
sed
'
$(TRANSFORM)
'
`
EMACSFULL
=
`
echo
emacs-
${version}${EXEEXT}
|
sed
'
$(TRANSFORM)
'
`
# Subdirectories to make recursively. `lisp' is not included
# because the compiled lisp files are part of the distribution.
# leim is not included because it needs special handling.
#
# Actually, we now include `lisp' as well, since the compiled files
# are not included any more in case of bootstrap or in case Emacs was
# checked out from a VCS.
SUBDIR
=
lib lib-src src lisp
# Subdirectories to make recursively.
SUBDIR
=
lib lib-src src lisp leim
# The subdir makefiles created by config.status.
SUBDIR_MAKEFILES_IN
=
@SUBDIR_MAKEFILES_IN@
...
...
@@ -280,7 +274,7 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
COPYDIR
=
${srcdir}
/etc
${srcdir}
/lisp
COPYDESTS
=
$(DESTDIR)${etcdir}
$(DESTDIR)${lispdir}
all
:
${SUBDIR}
leim
all
:
${SUBDIR}
removenullpaths
=
sed
-e
's/^://g'
-e
's/:$$//g'
-e
's/::/:/g'
...
...
@@ -305,18 +299,15 @@ epaths-force: FRC
-e
's;\(#.*PATH_DOC\).*$$;\1 "
${docdir}
";'
)
&&
\
${srcdir}
/build-aux/move-if-change epaths.h.
$$$$
src/epaths.h
# For parallel make, src should be built before leim.
leim
:
src Makefile FRC
cd
leim
&&
$(MAKE)
all
$(MFLAGS)
lib-src src
:
lib
src
:
lib-src FRC
.RECURSIVE
:
${SUBDIR}
leim
.RECURSIVE
:
${SUBDIR}
# We need to build `emacs' in `src' to compile the *.elc files in `lisp'.
lisp
:
src
# We need to build `emacs' in `src' to compile the *.elc files in `lisp'
# and `leim'.
lisp leim
:
src
# Maintainers can put a copy of gnulib into $(gnulib_srcdir).
gnulib_srcdir
=
../gnulib
...
...
@@ -356,7 +347,7 @@ sync-from-gnulib: $(gnulib_srcdir)
.PHONY
:
sync-from-gnulib
# These targets should be "${SUBDIR} without `src'".
lib lib-src lisp
:
Makefile FRC
lib lib-src lisp
leim
:
Makefile FRC
cd
$@
&&
$(MAKE)
all
$(MFLAGS)
\
CC
=
'
${CC}
'
CFLAGS
=
'
${CFLAGS}
'
CPPFLAGS
=
'
${CPPFLAGS}
'
\
LDFLAGS
=
'
${LDFLAGS}
'
MAKE
=
'
${MAKE}
'
...
...
@@ -818,7 +809,7 @@ maintainer-clean: bootstrap-clean FRC
### the coding standards seem to come from. It's like distclean, but
### it deletes backup and autosave files too.
extraclean
:
for
i
in
${SUBDIR}
leim
;
do
(
cd
$$
i
;
$(MAKE)
$(MFLAGS)
extraclean
)
;
done
for
i
in
${SUBDIR}
;
do
(
cd
$$
i
;
$(MAKE)
$(MFLAGS)
extraclean
)
;
done
${top_maintainer_clean}
-
rm
-f
config-tmp-
*
-
rm
-f
*
~
\#
*
...
...
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