Mercurial > emacs
comparison src/Makefile.in @ 108563:be6f5247ebb4
merge trunk
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Fri, 14 May 2010 16:29:06 +0900 |
| parents | 3088b1e22407 |
| children | 438f784b2966 |
comparison
equal
deleted
inserted
replaced
| 108561:23f4cd23ea89 | 108563:be6f5247ebb4 |
|---|---|
| 192 ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ | 192 ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ |
| 193 ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc | 193 ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc |
| 194 ## $MSDOS_SUPPORT_REAL if MSDOS. | 194 ## $MSDOS_SUPPORT_REAL if MSDOS. |
| 195 MSDOS_SUPPORT = | 195 MSDOS_SUPPORT = |
| 196 | 196 |
| 197 ns_appdir=@ns_appdir@/ | |
| 198 ns_appbindir=@ns_appbindir@/ | |
| 199 ns_appsrc=@ns_appsrc@ | |
| 197 NS_OBJ=@NS_OBJ@ | 200 NS_OBJ=@NS_OBJ@ |
| 198 NS_SUPPORT=@NS_SUPPORT@ | 201 NS_SUPPORT=@NS_SUPPORT@ |
| 199 ## Next two only set if NS_IMPL_GNUSTEP. | 202 ## Next two only set if NS_IMPL_GNUSTEP. |
| 200 GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ | 203 GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ |
| 201 GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ | 204 GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ |
| 330 #else /* not LINKER */ | 333 #else /* not LINKER */ |
| 331 LD=ld | 334 LD=ld |
| 332 #endif /* not LINKER */ | 335 #endif /* not LINKER */ |
| 333 | 336 |
| 334 #endif /* not ORDINARY_LINK */ | 337 #endif /* not ORDINARY_LINK */ |
| 335 | |
| 336 #ifdef HAVE_NS | |
| 337 ns_appdir=@ns_appdir@/ | |
| 338 ns_appbindir=@ns_appbindir@/ | |
| 339 ns_appsrc=@ns_appsrc@ | |
| 340 #endif /* HAVE_NS */ | |
| 341 | 338 |
| 342 /* lastfile must follow all files whose initialized data areas should | 339 /* lastfile must follow all files whose initialized data areas should |
| 343 be dumped as pure by dump-emacs. */ | 340 be dumped as pure by dump-emacs. */ |
| 344 obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ | 341 obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ |
| 345 charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \ | 342 charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \ |