aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-10-02 14:12:17 +0200
committerJuanma Barranquero2010-10-02 14:12:17 +0200
commit54b65f7b40dc380196bbe417e2912e509b2454ac (patch)
treefc77559565a9c5e70ae0ebb68ff3a31a7a7930b6
parentaffb61b481035b41c7c37b1acb2267a610605aa2 (diff)
downloademacs-54b65f7b40dc380196bbe417e2912e509b2454ac.tar.gz
emacs-54b65f7b40dc380196bbe417e2912e509b2454ac.zip
Rework tags targets in Windows makefiles to protect against old/stupid makes.
* lib-src/makefile.w32-in (tags): Remove target. * src/makefile.w32-in (tags): Rename target to full-tags.
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/makefile.w32-in1
-rw-r--r--src/ChangeLog4
-rw-r--r--src/makefile.w32-in4
4 files changed, 10 insertions, 3 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3d8a0222296..93d5e51d285 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12010-10-02 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (tags): Remove target.
4
12010-10-01 Eli Zaretskii <eliz@gnu.org> 52010-10-01 Eli Zaretskii <eliz@gnu.org>
2 6
3 * makefile.w32-in (tags, TAGS): New targets. 7 * makefile.w32-in (tags, TAGS): New targets.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 6d881dbc174..0ef2e06ec71 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -380,7 +380,6 @@ getopt.h: getopt_.h
380 380
381### TAGS ### 381### TAGS ###
382 382
383tags: TAGS
384TAGS: $(BLD)/etags.exe *.c *.h 383TAGS: $(BLD)/etags.exe *.c *.h
385 $(BLD)/etags.exe *.c *.h 384 $(BLD)/etags.exe *.c *.h
386 385
diff --git a/src/ChangeLog b/src/ChangeLog
index d09c4a1394c..a8ef551d885 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-10-02 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (tags): Rename target to full-tags.
4
12010-10-02 Eli Zaretskii <eliz@gnu.org> 52010-10-02 Eli Zaretskii <eliz@gnu.org>
2 6
3 * emacs.c (main): Remove !WINDOWSNT conditional. 7 * emacs.c (main): Remove !WINDOWSNT conditional.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index daa6ed52198..d4a7f47053e 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -335,8 +335,8 @@ nt-TAGS-nmake:
335 echo This target is not supported with NMake 335 echo This target is not supported with NMake
336 exit -1 336 exit -1
337 337
338tags: TAGS TAGS-LISP ../nt/TAGS 338full-tags: TAGS TAGS-LISP ../nt/TAGS
339.PHONY: tags 339.PHONY: full-tags
340 340
341### DEPENDENCIES ### 341### DEPENDENCIES ###
342 342