diff options
| author | Miles Bader | 2008-04-23 05:55:42 +0000 |
|---|---|---|
| committer | Miles Bader | 2008-04-23 05:55:42 +0000 |
| commit | a113b3ca322fd73d97d0d9d69c9f48dc13fb326a (patch) | |
| tree | 37b3ad22a198a83f68738ef86aec187bb6d926d9 /lib-src | |
| parent | e96a8d6dc0ffc35cf6c02924de2453c69fa8f6fe (diff) | |
| parent | 81fe843b5a3cc7708e0800aeb5bc0dbe448e800a (diff) | |
| download | emacs-a113b3ca322fd73d97d0d9d69c9f48dc13fb326a.tar.gz emacs-a113b3ca322fd73d97d0d9d69c9f48dc13fb326a.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ab8d490faef..61a0a0c0310 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-04-10 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (CLIENTRES): New variable and target. | ||
| 4 | (TRES): Remove. | ||
| 5 | ($(BLD)/emacsclientw.exe): Use $(CLIENTRES) instead of $(TRES). | ||
| 6 | |||
| 1 | 2008-04-19 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2008-04-19 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * vcdiff: Use "sccs get" rather than "get"; leave PATH alone. | 9 | * vcdiff: Use "sccs get" rather than "get"; leave PATH alone. |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 2d9954dbebc..e81b2efb529 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -75,18 +75,19 @@ ECLIENTOBJS = $(BLD)/emacsclient.$(O) \ | |||
| 75 | $(BLD)/getopt.$(O) \ | 75 | $(BLD)/getopt.$(O) \ |
| 76 | $(BLD)/getopt1.$(O) \ | 76 | $(BLD)/getopt1.$(O) \ |
| 77 | $(BLD)/ntlib.$(O) | 77 | $(BLD)/ntlib.$(O) |
| 78 | TRES = ../nt/$(BLD)/emacs.res | 78 | CLIENTRES = ../nt/$(BLD)/emacsclient.res |
| 79 | 79 | ||
| 80 | $(TRES): ../nt/emacs.rc | 80 | $(CLIENTRES): ../nt/emacsclient.rc |
| 81 | $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS) | 81 | @echo Emacsclient resource file must be built from nt directory |
| 82 | @exit -1 | ||
| 82 | 83 | ||
| 83 | $(BLD)/emacsclient.exe: $(ECLIENTOBJS) | 84 | $(BLD)/emacsclient.exe: $(ECLIENTOBJS) |
| 84 | # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib | 85 | # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib |
| 85 | $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) | 86 | $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) |
| 86 | 87 | ||
| 87 | $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES) | 88 | $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES) |
| 88 | # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib | 89 | # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib |
| 89 | $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) | 90 | $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) |
| 90 | 91 | ||
| 91 | # emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in | 92 | # emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in |
| 92 | # can be edited to define VERSION string, which is part of ECLIENT_CFLAGS. | 93 | # can be edited to define VERSION string, which is part of ECLIENT_CFLAGS. |