diff options
| author | Juanma Barranquero | 2010-10-03 14:36:19 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-10-03 14:36:19 +0200 |
| commit | 7f467e1413c2f812febfa99eb42eb60223d4b52b (patch) | |
| tree | f5666419418e278122e3785cd40201e22b9b6504 /src | |
| parent | 96bcef2ec619f55bf30d929f2da8d920f3c5540d (diff) | |
| download | emacs-7f467e1413c2f812febfa99eb42eb60223d4b52b.tar.gz emacs-7f467e1413c2f812febfa99eb42eb60223d4b52b.zip | |
src/makefile.w32-in (TAGS, TAGS-LISP, TAGS-gmake): Add $(FONTOBJ).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/makefile.w32-in | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fda33c8db17..70ed07cb24e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-10-03 Juanma Barranquero <lekktu@gmail.com> | 1 | 2010-10-03 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * makefile.w32-in (TAGS, TAGS-LISP, TAGS-gmake): Add $(FONTOBJ). | ||
| 4 | |||
| 3 | * gnutls.c (emacs_gnutls_handshake, gnutls_make_error) | 5 | * gnutls.c (emacs_gnutls_handshake, gnutls_make_error) |
| 4 | (gnutls_emacs_global_init, gnutls_emacs_global_deinit): Make static. | 6 | (gnutls_emacs_global_init, gnutls_emacs_global_deinit): Make static. |
| 5 | (Fgnutls_get_initstage, Fgnutls_deinit, Fgnutls_boot, Fgnutls_bye): | 7 | (Fgnutls_get_initstage, Fgnutls_deinit, Fgnutls_boot, Fgnutls_bye): |
diff --git a/src/makefile.w32-in b/src/makefile.w32-in index d4a7f47053e..4d30bacf9a2 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in | |||
| @@ -298,10 +298,10 @@ cleanall: clean | |||
| 298 | ## | 298 | ## |
| 299 | ## This works only with GNU Make. | 299 | ## This works only with GNU Make. |
| 300 | 300 | ||
| 301 | TAGS: $(OBJ0) $(OBJ1) $(WIN32OBJ) | 301 | TAGS: $(OBJ0) $(OBJ1) $(WIN32OBJ) $(FONTOBJ) |
| 302 | $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE) | 302 | $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE) |
| 303 | 303 | ||
| 304 | TAGS-LISP: $(OBJ0) $(OBJ1) $(WIN32OBJ) | 304 | TAGS-LISP: $(OBJ0) $(OBJ1) $(WIN32OBJ) $(FONTOBJ) |
| 305 | $(MAKE) $(MFLAGS) TAGS-LISP-$(MAKETYPE) | 305 | $(MAKE) $(MFLAGS) TAGS-LISP-$(MAKETYPE) |
| 306 | 306 | ||
| 307 | TAGS-gmake: | 307 | TAGS-gmake: |
| @@ -311,7 +311,9 @@ TAGS-gmake: | |||
| 311 | ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ | 311 | ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ |
| 312 | $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1)) | 312 | $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1)) |
| 313 | ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ | 313 | ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ |
| 314 | $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(WIN32OBJ)) $(CURDIR)/*.h | 314 | $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(WIN32OBJ)) \ |
| 315 | $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(FONTOBJ)) \ | ||
| 316 | $(CURDIR)/*.h | ||
| 315 | 317 | ||
| 316 | TAGS-nmake: | 318 | TAGS-nmake: |
| 317 | echo This target is not supported with NMake | 319 | echo This target is not supported with NMake |