aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorcg2013-03-23 17:30:38 +0200
committerEli Zaretskii2013-03-23 17:30:38 +0200
commitd7158313e21be4fb986627b38c2a5decc5844374 (patch)
tree200860f1351fa22763124b6b807400aeeed2c357 /lib-src
parent45f1d3626030a8e46408a23ae92a606665fc7325 (diff)
downloademacs-d7158313e21be4fb986627b38c2a5decc5844374.tar.gz
emacs-d7158313e21be4fb986627b38c2a5decc5844374.zip
Fix MSVC compilation problem in lib-src.
lib-src/makefile.w32-in (LIB_SRC): Move before first use.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/makefile.w32-in2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0d7a0a4591e..03412aa23b9 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12013-03-23 cg <chengang31@gmail.com> (tiny change)
2
3 * makefile.w32-in (LIB_SRC): Move before first use.
4
12013-03-16 Paul Eggert <eggert@cs.ucla.edu> 52013-03-16 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * pop.c: Fix ERRMAX typo (Bug#13925). 7 * pop.c: Fix ERRMAX typo (Bug#13925).
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 8d016bc16be..5ec559ff985 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -27,6 +27,7 @@ LOCAL_FLAGS = -DNO_LDAV=1 -DNO_ARCHIVES=1 -I../lib \
27 -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS) 27 -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
28 28
29LIBS = $(BASE_LIBS) $(ADVAPI32) 29LIBS = $(BASE_LIBS) $(ADVAPI32)
30LIB_SRC = .
30 31
31# The following target is used by makefile.w32-in files in other directories. 32# The following target is used by makefile.w32-in files in other directories.
32make-docfile: $(BLD)/make-docfile.exe 33make-docfile: $(BLD)/make-docfile.exe
@@ -360,7 +361,6 @@ TAGS: $(BLD)/etags.exe *.c *.h
360### DEPENDENCIES ### 361### DEPENDENCIES ###
361 362
362EMACS_ROOT = .. 363EMACS_ROOT = ..
363LIB_SRC = .
364SRC = $(EMACS_ROOT)/src 364SRC = $(EMACS_ROOT)/src
365NT_INC = $(EMACS_ROOT)/nt/inc 365NT_INC = $(EMACS_ROOT)/nt/inc
366GNU_LIB = $(EMACS_ROOT)/lib 366GNU_LIB = $(EMACS_ROOT)/lib