comparison src/Makefile.in.in @ 1346:01c57eb70ae9

[xemacs-hg @ 2003-03-09 02:27:27 by ben] To: xemacs-patches@xemacs.org i.c: Sleep between calls to check for I/O, since these calls are non-blocking. behavior.el: Allow other keywords for forward compatibility. cl-macs.el: Rewrite to eliminate byte-compiler warning when `return' is used without `finally'. cmdloop.el: Avoid truncated error messages for `end-of-file' and the like. cmdloop.el: Avoid char-int error after syncing. files.el: Eliminate byte-compile warnings. printer.el: Fix line-width calculations. #### This used to work. Someone's changes (perhaps by Michael Sperber?) seem to have messed something up. simple.el: Use new clear-left-side functions to avoid messages ending up on the same line as other output. xemacs.mak: Add override for info/ as well when separate source/build dirs. xemacs.mak: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. Makefile.in.in: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. alloc.c: Don't arbitrarily clear Vconfigure_info_directory since it messes up separate build/source dirs. console.c, console.h, device-msw.c, device.c: Add accidentally omitted msprinter console and data descriptions. print.c, console-msw.c: Add clear-left-side functionality to help keep stdio/stderr output from separate sources on separate lines. Generalize the different kinds of debugging output. Add dpa(). profile.c: Add better docs on Unix/Windows differences. regex.c: Fix problems with rel-alloc compilation caused by previous patch. emacs.c: Seg fault rather than abort on Cygwin, since gdb doesn't trap aborts properly. console-gtk-impl.h, console-gtk.h, console-msw.h, console-x-impl.h, console-x.h, dialog-gtk.c, dialog-x.c, event-msw.c, frame-gtk.c, frame-x.c, frameslots.h, glyphs-gtk.c, glyphs-x.c, gui-gtk.c, gui-x.c, inline.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, scrollbar-gtk.c, scrollbar-x.c, ui-gtk.c: Delete popup-data object. Delete menubar_data field from frames, since its usage is frame-specific. Delete menubar-msw.h, gui-x.h, gui-gtk.h. Clean up handling of lwlib callback data GCPRO'ing and add missing GCPRO recomputation in widget code.
author ben
date Sun, 09 Mar 2003 02:27:46 +0000
parents 4542b72c005e
children c88a785b01d8
comparison
equal deleted inserted replaced
1345:3b27da507d56 1346:01c57eb70ae9
496 ## use the method #1 above, and nmake must use method #2. 496 ## use the method #1 above, and nmake must use method #2.
497 497
498 ## -ben 498 ## -ben
499 499
500 .PHONY: build-the-mofo 500 .PHONY: build-the-mofo
501 build-the-mofo: $(DUMP_TARGET) $(mo_file) $(other_files) update-elc-2 $(LISP)/finder-inf.el load-shadows 501 build-the-mofo: update-elc-2 $(mo_file) $(other_files) $(LISP)/finder-inf.el load-shadows
502 .NO_PARALLEL: $(DUMP_TARGET) update-elc-2 $(LISP)/finder-inf.el load-shadows 502
503 503 ## (1) Compile all dependencies of the XEmacs executable
504 release: all 504
505 -if [ -w $(LISP) ]; then \ 505 #ifdef HAVE_X_WINDOWS
506 w=`pwd`; cd $(SRC) && $$w/$(RAW_EXE) -nd $(BATCH) -l $(LISP)/inc-vers; \ 506 lwlib_deps = $(lwlib_lib)
507 else true; fi 507 $(lwlib_lib):
508 -$(dump_temacs) 508 cd ../lwlib && $(RECURSIVE_MAKE)
509 touch release 509 #endif /* HAVE_X_WINDOWS */
510 510
511 ## Update out-of-date .elcs, other than needed for dumping. 511 #ifdef DYNODUMP
512 .PHONY: update-elc-2 512 dynodump_deps = ../dynodump/dynodump.so
513 update-elc-2: 513 ../dynodump/dynodump.so:
514 $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP) 514 cd ../dynodump && $(RECURSIVE_MAKE)
515 515 #endif /* DYNODUMP */
516 $(LISP)/finder-inf.el: 516
517 @echo "Building finder database ..." 517 link_deps = $(start_files) $(objs) $(otherobjs) $(lwlib_deps) $(dynodump_deps)
518 $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \ 518
519 -l finder -f finder-compile-keywords 519 $(LIB_SRC)/make-dump-id:
520 @echo "Building finder database ...(done)" 520 cd $(LIB_SRC) && $(RECURSIVE_MAKE) make-dump-id
521 521
522 .PHONY: load-shadows 522 dump-id.c: $(LIB_SRC)/make-dump-id $(link_deps)
523 load-shadows: 523 $(LIB_SRC)/make-dump-id
524 #ifndef QUICK_BUILD 524
525 @echo "Testing for Lisp shadows ..." 525 ## (2) Link the XEmacs executable
526 @$(XEMACS_BATCH) -f list-load-path-shadows 526
527 #endif 527 temacs_deps = $(link_deps) $(DUMP_ID)
528
529 temacs_link_args = \
530 $(start_flags) $(ldflags) \
531 -o $@ $(start_files) $(objs) $(otherobjs) $(DUMP_ID) $(LIBES)
532
533 $(RAW_EXE): $(temacs_deps)
534 $(LD) $(temacs_link_args)
535
536 ## (3) Update the .elc's needed for dumping
528 537
529 .PHONY: FRC.needtodump 538 .PHONY: FRC.needtodump
530 FRC.needtodump: 539 FRC.needtodump:
531 540
532 ## This file is touched by update-elc.el when redumping is necessary. 541 ## This file is touched by update-elc.el when redumping is necessary.
533 ## We use $(BLDSRC) == `.' here to help keep sync with nt/xemacs.mak, 542 ## We use $(BLDSRC) == `.' here to help keep sync with nt/xemacs.mak,
534 ## where $(BLDSRC) is not `.'. 543 ## where $(BLDSRC) is not `.'.
535 $(BLDSRC)/NEEDTODUMP: FRC.needtodump 544 $(BLDSRC)/NEEDTODUMP: FRC.needtodump
536 $(TEMACS_BATCH) -l $(LISP)/update-elc.el 545 $(TEMACS_BATCH) -l $(LISP)/update-elc.el
546
547 ## (4) Build the DOC file
548
549 obj_src = $(objs:.o=.c)
550
551 $(LIB_SRC)/make-docfile:
552 cd $(LIB_SRC) && $(RECURSIVE_MAKE) make-docfile
553
554 $(LIB_SRC)/DOC: $(LIB_SRC)/make-docfile $(BLDSRC)/NEEDTODUMP $(temacs_deps)
555 #ifdef QUICK_BUILD
556 if test ! -f $@ ; then \
557 #else
558 if true ; then \
559 #endif
560 $(TEMACS_BATCH) -l $(LISP)/make-docfile.el -- \
561 -o $(LIB_SRC)/DOC -d $(SRC) -i $(LIB_SRC)/../site-packages \
562 $(obj_src) $(mallocdocsrc) $(rallocdocsrc) \
563 $(extra_doc_files) ; fi
564
565 ## (5) Dump
537 566
538 $(DUMP_TARGET): $(RAW_EXE) $(BLDSRC)/NEEDTODUMP $(LIB_SRC)/DOC 567 $(DUMP_TARGET): $(RAW_EXE) $(BLDSRC)/NEEDTODUMP $(LIB_SRC)/DOC
539 #ifdef HEAP_IN_DATA 568 #ifdef HEAP_IN_DATA
540 @$(RM) $@ && touch SATISFIED 569 @$(RM) $@ && touch SATISFIED
541 $(dump_temacs) 570 $(dump_temacs)
544 #else 573 #else
545 @$(RM) $@ 574 @$(RM) $@
546 $(dump_temacs) 575 $(dump_temacs)
547 #endif 576 #endif
548 577
549 #ifdef HAVE_X_WINDOWS 578 ## (6) Update the remaining .elc's, post-dumping
550 lwlib_deps = $(lwlib_lib) 579
551 $(lwlib_lib): 580 .PHONY: update-elc-2
552 cd ../lwlib && $(RECURSIVE_MAKE) 581 update-elc-2: $(DUMP_TARGET)
553 #endif /* HAVE_X_WINDOWS */ 582 $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP)
554 583
555 #ifdef DYNODUMP 584 ## (7) Other random stuff
556 dynodump_deps = ../dynodump/dynodump.so 585
557 ../dynodump/dynodump.so: 586 $(LISP)/finder-inf.el: update-elc-2
558 cd ../dynodump && $(RECURSIVE_MAKE) 587 @echo "Building finder database ..."
559 #endif /* DYNODUMP */ 588 $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \
560 589 -l finder -f finder-compile-keywords
561 link_deps = $(start_files) $(objs) $(otherobjs) $(lwlib_deps) $(dynodump_deps) 590 @echo "Building finder database ...(done)"
562 591
563 temacs_deps = $(link_deps) $(DUMP_ID) 592 .PHONY: load-shadows
564 593 load-shadows: update-elc-2
565 temacs_link_args = \ 594 #ifndef QUICK_BUILD
566 $(start_flags) $(ldflags) \ 595 @echo "Testing for Lisp shadows ..."
567 -o $@ $(start_files) $(objs) $(otherobjs) $(DUMP_ID) $(LIBES) 596 @$(XEMACS_BATCH) -f list-load-path-shadows
568 597 #endif
569 $(RAW_EXE): $(temacs_deps) 598
570 $(LD) $(temacs_link_args) 599 ###################### Misc targets
571 600
572 dump-id.c: $(LIB_SRC)/make-dump-id $(link_deps) 601 release: all
573 $(LIB_SRC)/make-dump-id 602 -if [ -w $(LISP) ]; then \
574 603 w=`pwd`; cd $(SRC) && $$w/$(RAW_EXE) -nd $(BATCH) -l $(LISP)/inc-vers; \
575 obj_src = $(objs:.o=.c) 604 else true; fi
576 605 -$(dump_temacs)
577 $(LIB_SRC)/DOC: $(LIB_SRC)/make-docfile $(BLDSRC)/NEEDTODUMP $(temacs_deps) 606 touch release
578 #ifdef QUICK_BUILD
579 if test ! -f $@ ; then \
580 #else
581 if true ; then \
582 #endif
583 $(TEMACS_BATCH) -l $(LISP)/make-docfile.el -- \
584 -o $(LIB_SRC)/DOC -d $(SRC) -i $(LIB_SRC)/../site-packages \
585 $(obj_src) $(mallocdocsrc) $(rallocdocsrc) \
586 $(extra_doc_files) ; fi
587
588 $(LIB_SRC)/make-dump-id:
589 cd $(LIB_SRC) && $(RECURSIVE_MAKE) make-dump-id
590
591 $(LIB_SRC)/make-docfile:
592 cd $(LIB_SRC) && $(RECURSIVE_MAKE) make-docfile
593 607
594 .PHONY: fastdump 608 .PHONY: fastdump
595 fastdump: $(RAW_EXE) 609 fastdump: $(RAW_EXE)
596 @$(RM) $(DUMP_TARGET) && touch SATISFIED 610 @$(RM) $(DUMP_TARGET) && touch SATISFIED
597 -$(dump_temacs) 611 -$(dump_temacs)