diff options
| author | Eli Zaretskii | 2013-04-01 17:35:26 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-01 17:35:26 +0300 |
| commit | 030a1c5ea67b4d236f3dc31542e51128a8ee0685 (patch) | |
| tree | b47fbdc73c2588d2fb6f50a4396f93ad3f742123 /src | |
| parent | f540ee868c7d91421d9bbf6ca239782013dfc266 (diff) | |
| download | emacs-030a1c5ea67b4d236f3dc31542e51128a8ee0685.tar.gz emacs-030a1c5ea67b4d236f3dc31542e51128a8ee0685.zip | |
Fixed nt/Makefile.in and top-level Makefile.in.
Programs in nt/ and lib-src/ compile and link.
Warnings and errors in src/.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index cac8ddec57c..62c1e51e298 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -524,7 +524,8 @@ doc.o: buildobj.h | |||
| 524 | emacs.res: $(ntsource)/emacs.rc \ | 524 | emacs.res: $(ntsource)/emacs.rc \ |
| 525 | $(ntsource)/icons/emacs.ico \ | 525 | $(ntsource)/icons/emacs.ico \ |
| 526 | $(ntsource)/$(EMACS_MANIFEST) | 526 | $(ntsource)/$(EMACS_MANIFEST) |
| 527 | $(WINDRES) -O COFF -o $@ $(ntsource)/emacs.rc | 527 | $(WINDRES) -O COFF --include-dir=$(srcdir)/../nt \ |
| 528 | -o $@ $(ntsource)/emacs.rc | ||
| 528 | 529 | ||
| 529 | ns-app: emacs$(EXEEXT) | 530 | ns-app: emacs$(EXEEXT) |
| 530 | cd ../nextstep && $(MAKE) $(MFLAGS) all | 531 | cd ../nextstep && $(MAKE) $(MFLAGS) all |