diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lib-src/makefile.w32-in | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lib-src/makefile.w32-in')
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||
| 29 | LIBS = $(BASE_LIBS) $(ADVAPI32) | 29 | LIBS = $(BASE_LIBS) $(ADVAPI32) |
| 30 | LIB_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. |
| 32 | make-docfile: $(BLD)/make-docfile.exe | 33 | make-docfile: $(BLD)/make-docfile.exe |
| @@ -360,7 +361,6 @@ TAGS: $(BLD)/etags.exe *.c *.h | |||
| 360 | ### DEPENDENCIES ### | 361 | ### DEPENDENCIES ### |
| 361 | 362 | ||
| 362 | EMACS_ROOT = .. | 363 | EMACS_ROOT = .. |
| 363 | LIB_SRC = . | ||
| 364 | SRC = $(EMACS_ROOT)/src | 364 | SRC = $(EMACS_ROOT)/src |
| 365 | NT_INC = $(EMACS_ROOT)/nt/inc | 365 | NT_INC = $(EMACS_ROOT)/nt/inc |
| 366 | GNU_LIB = $(EMACS_ROOT)/lib | 366 | GNU_LIB = $(EMACS_ROOT)/lib |