Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8c4afe20
Commit
8c4afe20
authored
Oct 07, 2009
by
Juanma Barranquero
Browse files
* makefile.w32-in (WINS_UPDATES): New macro.
(custom-deps, finder-data, autoloads): Use it.
parent
ee2e93e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
7 deletions
+20
-7
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/makefile.w32-in
lisp/makefile.w32-in
+15
-7
No files found.
lisp/ChangeLog
View file @
8c4afe20
2009-10-07 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (WINS_UPDATES): New macro.
(custom-deps, finder-data, autoloads): Use it.
2009-10-07 Glenn Morris <rgm@gnu.org>
* Makefile.in (autoloads): Revert previous change.
...
...
lisp/makefile.w32-in
View file @
8c4afe20
...
...
@@ -118,12 +118,19 @@ WINS_BASIC=\
textmodes \
url
# Directories with lisp files to compile
WINS_ALMOST
=
$(WINS_BASIC)
\
$(WINS_CEDET)
# Directories to extract data from (customs, autoloads, etc.)
WINS_UPDATES
=
$(WIN_ALMOST)
\
$(WINS_CEDET_SUBDIRS)
# Directories to add to subdirs.el
WINS_SUBDIR
=
$(WINS_BASIC)
\
obsolete
# All directories, except CEDET subdirs
WINS
=
$(WINS_ALMOST)
\
term \
obsolete
...
...
@@ -158,12 +165,13 @@ $(lisp)/cus-load.el:
# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
# this can break with GNU Make 3.81 and later if sh.exe is used.
custom-deps
:
$(lisp)/cus-load.el $(lisp)/loaddefs.el doit
@
echo
Directories:
$(WINS_ALMOST)
-
$(emacs)
-l
cus-dep
--eval
$(ARGQUOTE)
(
setq find-file-hook nil
)
$(ARGQUOTE)
-f
custom-make-dependencies
$(lisp)
$(WINS_ALMOST)
@
echo
Directories:
$(WINS_UPDATES)
-
$(emacs)
-l
cus-dep
--eval
$(ARGQUOTE)
(
setq find-file-hook nil
)
$(ARGQUOTE)
\
-f
custom-make-dependencies
$(lisp)
$(WINS_UPDATES)
finder-data
:
$(lisp)/loaddefs.el doit
@
echo
Directories:
$(WINS_
ALMOST
)
$(emacs)
-l
finder
-f
finder-compile-keywords-make-dist
$(lisp)
$(WINS_
ALMOST
)
@
echo
Directories:
$(WINS_
UPDATES
)
$(emacs)
-l
finder
-f
finder-compile-keywords-make-dist
$(lisp)
$(WINS_
UPDATES
)
$(lisp)/loaddefs.el
:
$(MAKE)
$(MFLAGS)
loaddefs.el-
$(SHELLTYPE)
...
...
@@ -203,10 +211,10 @@ loaddefs.el-CMD:
# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
# this can break with GNU Make 3.81 and later if sh.exe is used.
autoloads
:
$(lisp)/loaddefs.el $(LOADDEFS) doit
@
echo
Directories:
.
$(WINS_
ALMOST
)
@
echo
Directories:
.
$(WINS_
UPDATES
)
$(emacs)
-l
autoload
\
--eval
$(ARGQUOTE)
(
setq find-file-hook nil find-file-suppress-same-file-warnings t
)
$(ARGQUOTE)
\
-f
w32-batch-update-autoloads
"
$(lisp)
/loaddefs.el"
.
$(WINS_
ALMOST
)
-f
w32-batch-update-autoloads
"
$(lisp)
/loaddefs.el"
.
$(WINS_
UPDATES
)
$(lisp)/subdirs.el
:
$(MAKE)
$(MFLAGS)
update-subdirs
...
...
@@ -423,7 +431,7 @@ bootstrap-clean-CMD:
bootstrap-clean-SH
:
# if test -f "$(EMACS)"; then $(MAKE) $(MFLAGS) autoloads; fi
# -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
-for
dir
in
.
$(WINS)
$(WINS_CEDET_SUBDIRS);
do
rm
-f
$$dir/*.elc
$$dir/*/*.elc
$$dir/*/*/*.elc;
done
-for
dir
in
.
$(WINS)
$(WINS_CEDET_SUBDIRS);
do
rm
-f
$$dir/*.elc
$$dir/*/*.elc
$$dir/*/*/*.elc;
done
# Generate/update files for the bootstrap process.
# When done, remove bootstrap-emacs from ../bin, so that
...
...
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