diff options
| author | Stefan Monnier | 2004-04-12 19:43:10 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2004-04-12 19:43:10 +0000 |
| commit | d845b2f364e6f491d547cbf318f04beeac5d9f24 (patch) | |
| tree | ce657be3859d2ca8fc3779aadb296df94ecddfe1 /src | |
| parent | 451f03a04f06a26771dd08ca48f7f00465c885cf (diff) | |
| download | emacs-d845b2f364e6f491d547cbf318f04beeac5d9f24.tar.gz emacs-d845b2f364e6f491d547cbf318f04beeac5d9f24.zip | |
Link changes for Cygwin unexec() support.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 678e4f89f44..c1399942ffa 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Makefile for GNU Emacs. | 1 | # Makefile for GNU Emacs. |
| 2 | # Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 2001, 2003 | 2 | # Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 01, 03, 2004 |
| 3 | # Free Software Foundation, Inc. | 3 | # Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # This file is part of GNU Emacs. | 5 | # This file is part of GNU Emacs. |
| @@ -564,6 +564,10 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o | |||
| 564 | #endif | 564 | #endif |
| 565 | #endif | 565 | #endif |
| 566 | 566 | ||
| 567 | #ifdef CYGWIN | ||
| 568 | CYGWIN_OBJ = sheap.o | ||
| 569 | #endif | ||
| 570 | |||
| 567 | #ifdef HAVE_CARBON | 571 | #ifdef HAVE_CARBON |
| 568 | mac = $(dot)$(dot)/mac/ | 572 | mac = $(dot)$(dot)/mac/ |
| 569 | MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o | 573 | MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o |
| @@ -586,7 +590,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ | |||
| 586 | process.o callproc.o \ | 590 | process.o callproc.o \ |
| 587 | region-cache.o sound.o atimer.o \ | 591 | region-cache.o sound.o atimer.o \ |
| 588 | doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ | 592 | doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ |
| 589 | $(MSDOS_OBJ) $(MAC_OBJ) | 593 | $(MSDOS_OBJ) $(MAC_OBJ) $(CYGWIN_OBJ) |
| 590 | 594 | ||
| 591 | /* Object files used on some machine or other. | 595 | /* Object files used on some machine or other. |
| 592 | These go in the DOC file on all machines | 596 | These go in the DOC file on all machines |
| @@ -643,7 +647,12 @@ widgetobj= | |||
| 643 | 647 | ||
| 644 | /* define otherobj as list of object files that make-docfile | 648 | /* define otherobj as list of object files that make-docfile |
| 645 | should not be told about. */ | 649 | should not be told about. */ |
| 650 | #ifdef CYGWIN | ||
| 651 | /* Cygwin differs because of its unexec(). */ | ||
| 652 | otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(allocaobj) $(widgetobj) $(LIBOBJS) | ||
| 653 | #else | ||
| 646 | otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBOBJS) | 654 | otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBOBJS) |
| 655 | #endif | ||
| 647 | 656 | ||
| 648 | #ifdef HAVE_MOUSE | 657 | #ifdef HAVE_MOUSE |
| 649 | #define MOUSE_SUPPORT ${lispsource}mouse.elc \ | 658 | #define MOUSE_SUPPORT ${lispsource}mouse.elc \ |