diff options
| author | Joakim Verona | 2012-12-11 12:02:20 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-11 12:02:20 +0100 |
| commit | 5ccd4f20470d8e216ca3eae26339100a5eab52f1 (patch) | |
| tree | 70caca485fbaef0dcce16a811908c4b9b121ee1e /lib | |
| parent | c0b95835acf65071ac1d740d15f7bcaa55c2a04b (diff) | |
| parent | c6afe371b0218154957bbef17c3f8bda5377b7c8 (diff) | |
| download | emacs-5ccd4f20470d8e216ca3eae26339100a5eab52f1.tar.gz emacs-5ccd4f20470d8e216ca3eae26339100a5eab52f1.zip | |
some conflict resolution
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/makefile.w32-in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index b27e21032b3..1482d686acb 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in | |||
| @@ -103,6 +103,8 @@ U64_H = $(GNU_LIB)/u64.h \ | |||
| 103 | $(NT_INC)/stdint.h | 103 | $(NT_INC)/stdint.h |
| 104 | SHA512_H = $(GNU_LIB)/sha512.h \ | 104 | SHA512_H = $(GNU_LIB)/sha512.h \ |
| 105 | $(U64_H) | 105 | $(U64_H) |
| 106 | SIG2STR_H = $(GNU_LIB)/sig2str.h \ | ||
| 107 | $(GNU_LIB)/intprops.h | ||
| 106 | STAT_TIME_H = $(GNU_LIB)/stat-time.h \ | 108 | STAT_TIME_H = $(GNU_LIB)/stat-time.h \ |
| 107 | $(NT_INC)/sys/stat.h | 109 | $(NT_INC)/sys/stat.h |
| 108 | 110 | ||
| @@ -243,8 +245,7 @@ $(BLD)/filemode.$(O) : \ | |||
| 243 | $(BLD)/sig2str.$(O) : \ | 245 | $(BLD)/sig2str.$(O) : \ |
| 244 | $(GNU_LIB)/sig2str.c \ | 246 | $(GNU_LIB)/sig2str.c \ |
| 245 | $(CONFIG_H) \ | 247 | $(CONFIG_H) \ |
| 246 | $(GNU_LIB)/sig2str.h \ | 248 | $(SIG2STR_H) |
| 247 | $(GNU_LIB)/intprops.h | ||
| 248 | 249 | ||
| 249 | 250 | ||
| 250 | # The following dependencies are for supporting parallel builds, where | 251 | # The following dependencies are for supporting parallel builds, where |