Mercurial > emacs
view lisp/makefile.w32-in @ 59146:9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
(struct glyph_string): Likewise.
* emacs.c (main) [MAC_OS8]: Call mac_term_init instead of
mac_initialize.
* fileio.c (Fnext_read_file_uses_dialog_p, Fread_file_name):
Change TARGET_API_MAC_CARBON to HAVE_CARBON.
* fns.c (vector): Change MAC_OSX to MAC_OS.
* frame.c (x_set_frame_parameters, x_report_frame_params)
(x_set_fullscreen): Remove #ifndef HAVE_CARBON.
(x_set_border_width, Vdefault_frame_scroll_bars): Change
HAVE_CARBON to MAC_OS.
* image.c [MAC_OS]: Include sys/stat.h.
[MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and
QuickTimeComponents.h.
* mac.c [!MAC_OSX] (mac_wait_next_event): Add extern.
[!MAC_OSX] (select): Use mac_wait_next_event.
[!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to
Vexec_suffixes.
[!MAC_OSX] (select, run_mac_command): Change `#ifdef
TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
(mac_clear_font_name_table): Add extern.
(Fmac_clear_font_name_table): New defun.
(syms_of_mac): Defsubr it.
[MAC_OSX] (SELECT_POLLING_PERIOD_USEC): New define.
[MAC_OSX] (select_and_poll_event): New function.
[MAC_OSX] (sys_select): Use it.
[MAC_OSX && SELECT_USE_CFSOCKET] (socket_callback): New function.
[MAC_OSX && SELECT_USE_CFSOCKET]
(SELECT_TIMEOUT_THRESHOLD_RUNLOOP, EVENT_CLASS_SOCK): New defines.
[MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Use CFSocket and
RunLoop for simultaneously monitoring two kinds of inputs, window
events and process outputs, without periodically polling.
* macfns.c (mac_initialized): Remove extern.
(stricmp): Put in #if 0. All callers changed to use xstricmp in
xfaces.c.
(strnicmp): Decrement `n' at the end of each loop, not the
beginning.
(check_mac): Use the term "Mac native windows" instead of "Mac
OS".
(check_x_display_info, x_display_info_for_name): Sync with xfns.c.
(mac_get_rdb_resource): New function (from w32reg.c).
(x_get_string_resource): Use it.
(install_window_handler): Add extern.
(mac_window): New function.
(Fx_create_frame): Use it instead of make_mac_frame. Set
parameter for Qfullscreen. Call x_wm_set_size_hint.
(Fx_open_connection, Fx_close_connection): New defuns.
(syms_of_macfns): Defsubr them.
(x_create_tip_frame) [TARGET_API_MAC_CARBON]: Add
kWindowNoUpdatesAttribute to the window attribute.
(x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow.
(x_create_tip_frame): Don't call ShowWindow.
(Fx_show_tip): Call ShowWindow.
(Fx_file_dialog): Change `#ifdef TARGET_API_MAC_CARBON' to `#if
TARGET_API_MAC_CARBON'.
(mac_frame_parm_handlers): Set handlers for Qfullscreen.
(syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0.
* macgui.h [!MAC_OSX]: Don't include Controls.h. Include
Windows.h.
(Window): Typedef to WindowPtr and move outside `#if
TARGET_API_MAC_CARBON'.
(XSizeHints): New struct.
* macterm.c (x_update_begin, x_update_end)
[TARGET_API_MAC_CARBON]: Disable screen updates during update of a
frame.
(x_draw_glyph_string_background, x_draw_glyph_string_foreground)
[MAC_OS8]: Use XDrawImageString/XDrawImageString16.
(construct_mouse_click): Put in #if 0.
(x_check_fullscreen, x_check_fullscreen_move): Remove decls.
(x_scroll_bar_create, x_scroll_bar_handle_click): Change `#ifdef
TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
(activate_scroll_bars, deactivate_scroll_bars)
[!TARGET_API_MAC_CARBON]: Use ActivateControl/DeactivateControl.
(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
if the position is neither user-specified nor program-specified.
(x_free_frame_resources): Free size_hints.
(x_wm_set_size_hint): Allocate size_hints if needed. Set
size_hints.
(mac_clear_font_name_table): New function.
(mac_do_list_fonts): Initialize font_name_table if needed.
(x_list_fonts): Don't initialize font_name_table. Add BLOCK_INPUT
around mac_do_list_fonts.
(mac_unload_font): New function.
(x_load_font): Add BLOCK_INPUT around XLoadQueryFont.
(init_mac_drag_n_drop, mac_do_receive_drag): Enclose declarations
and definitions with #if TARGET_API_MAC_CARBON.
[USE_CARBON_EVENTS] (mac_handle_window_event): Add decl.
(install_window_handler): Add decl.
(do_window_update): Add BeginUpdate/EndUpdate for the tooltip
window. Use UpdateControls. Get the rectangle that should be
updated and restrict the target of expose_frame to it.
(do_grow_window): Set minimum height/width according to
size_hints.
(do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow.
(do_zoom_window): Don't use x_set_window_size.
[USE_CARBON_EVENTS] (mac_handle_window_event): New function.
(install_window_handler): New function.
[!USE_CARBON_EVENTS] (mouse_region): New variable.
[!USE_CARBON_EVENTS] (mac_wait_next_event): New function.
(XTread_socket) [USE_CARBON_EVENTS]: Move call to
GetEventDispatcherTarget inside BLOCK_INPUT.
(XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event.
Update mouse_region when mouse is moved.
(make_mac_frame): Remove.
(make_mac_terminal_frame): Put in #ifdef MAC_OS8. Initialize
mouse pointer shapes. Change values of f->left_pos and
f->top_pos. Don't use make_mac_frame. Use NewCWindow. Don't
call ShowWindow.
(mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from
Vinvocation_name and Vsystem_name.
(mac_make_rdb): New function (from w32term.c).
(mac_term_init): Use it. Add BLOCK_INPUT. Error if display has
already been opened. Don't pass argument to
mac_initialize_display_info. Don't set dpyinfo->height/width.
Add entries to x_display_list and x_display_name_list.
(x_delete_display): New function.
(mac_initialize): Don't call mac_initialize_display_info.
(syms_of_macterm) [!MAC_OSX]: Don't call Fprovide.
* macterm.h (check_mac): Add extern.
(struct mac_output): New member size_hints.
(FRAME_SIZE_HINTS): New macro.
(mac_unload_font): Add extern.
* xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
* xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.
author | Steven Tamm <steventamm@mac.com> |
---|---|
date | Mon, 27 Dec 2004 17:27:30 +0000 |
parents | dc994538d85a |
children | 020a384cb96d e24e2e78deda |
line wrap: on
line source
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. # Copyright (c) 2000,2001,2004 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # # GNU Emacs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # ALL = all: $(ALL) SQUOTE=' # ' lisp = $(CURDIR) srcdir = $(CURDIR)/.. # You can specify a different executable on the make command line, # e.g. "make EMACS=../src/emacs ...". EMACS = "$(THISDIR)/../bin/emacs.exe" # Command line flags for Emacs. This must include --multibyte, # otherwise some files will not compile. EMACSOPT = -batch --no-init-file --no-site-file --multibyte # Set EMACSLOADPATH correctly (already defined in environment). EMACSLOADPATH=$(lisp) lisptagsfiles1 = $(lisp)/*.el lisptagsfiles2 = $(lisp)/*/*.el ETAGS = "../lib-src/$(BLD)/etags" # Files which should not be compiled. If you change the name `DONTCOMPILE' # to something different, you'll have to change make-dist as well, and # modify the lists in $lisp and $shortlisp on src/Makefile.in. # # - emacs-lisp/cl-specs.el: only contains `def-edebug-spec's so there's # no point compiling it, although it doesn't hurt. DONTCOMPILE = \ $(lisp)/cus-load.el \ $(lisp)/emacs-lisp/cl-specs.el \ $(lisp)/eshell/esh-maint.el \ $(lisp)/eshell/esh-groups.el \ $(lisp)/finder-inf.el \ $(lisp)/forms-d2.el \ $(lisp)/forms-pass.el \ $(lisp)/generic-x.el \ $(lisp)/international/latin-1.el \ $(lisp)/international/latin-2.el \ $(lisp)/international/latin-3.el \ $(lisp)/international/latin-4.el \ $(lisp)/international/latin-5.el \ $(lisp)/international/latin-8.el \ $(lisp)/international/latin-9.el \ $(lisp)/international/mule-conf.el \ $(lisp)/language/czech.el \ $(lisp)/language/devanagari.el \ $(lisp)/language/kannada.el \ $(lisp)/language/malayalam.el \ $(lisp)/language/tamil.el \ $(lisp)/language/english.el \ $(lisp)/language/greek.el \ $(lisp)/language/hebrew.el \ $(lisp)/language/japanese.el \ $(lisp)/language/korean.el \ $(lisp)/language/lao.el \ $(lisp)/language/misc-lang.el \ $(lisp)/language/romanian.el \ $(lisp)/language/slovak.el \ $(lisp)/language/thai.el \ $(lisp)/language/utf-8-lang.el \ $(lisp)/language/georgian.el \ $(lisp)/loaddefs.el \ $(lisp)/ldefs-boot.el \ $(lisp)/loadup.el \ $(lisp)/mail/blessmail.el \ $(lisp)/patcomp.el \ $(lisp)/paths.el \ $(lisp)/play/bruce.el \ $(lisp)/subdirs.el \ $(lisp)/term/internal.el \ $(lisp)/term/AT386.el \ $(lisp)/term/apollo.el \ $(lisp)/term/bobcat.el \ $(lisp)/term/iris-ansi.el \ $(lisp)/term/keyswap.el \ $(lisp)/term/linux.el \ $(lisp)/term/lk201.el \ $(lisp)/term/news.el \ $(lisp)/term/vt102.el \ $(lisp)/term/vt125.el \ $(lisp)/term/vt200.el \ $(lisp)/term/vt201.el \ $(lisp)/term/vt220.el \ $(lisp)/term/vt240.el \ $(lisp)/term/vt300.el \ $(lisp)/term/vt320.el \ $(lisp)/term/vt400.el \ $(lisp)/term/vt420.el \ $(lisp)/term/wyse50.el \ $(lisp)/version.el # Files to compile before others during a bootstrap. This is done to # speed up the bootstrap process. The CC files are compiled first # because CC mode tweaks the compilation process, and requiring # cc-mode when it is not compiled doesn't work during the # bootstrapping. COMPILE_FIRST = \ $(lisp)/emacs-lisp/byte-opt.el \ $(lisp)/emacs-lisp/bytecomp.el \ $(lisp)/subr.el \ $(lisp)/progmodes/cc-mode.el \ $(lisp)/progmodes/cc-vars.el # The actual Emacs command run in the targets below. emacs = $(EMACS) $(EMACSOPT) # Common command to find subdirectories setwins=subdirs=`find $$wd -type d -print`; \ for file in $$subdirs; do \ case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \ *) wins="$$wins $$file" ;; \ esac; \ done # Have to define the list of subdirs manually when not using sh. WINS=\ calc \ calendar \ emacs-lisp \ emulation \ eshell \ gnus \ international \ language \ mail \ mh-e \ net \ obsolete \ play \ progmodes \ term \ textmodes \ toolbar \ url doit: cus-load.el: touch $@ custom-deps: cus-load.el doit @echo Directories: $(WINS) -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS) finder-data: doit @echo Directories: $(WINS) $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS) loaddefs.el: $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE) cp loaddefs.el-$(SHELLTYPE) $@ rm loaddefs.el-$(SHELLTYPE) loaddefs.el-SH: echo ";;; loaddefs.el --- automatically extracted autoloads" > $@ echo ";;" >> $@; echo ";;; Code:" >> $@ echo "(autoload 'define-minor-mode \"easy-mmode\")" >>$@ echo "(autoload 'define-ccl-program \"ccl\")" >>$@ echo "(autoload 'regexp-opt \"regexp-opt\")" >>$@ echo "(autoload 'string-to-list \"mule-util\")" >>$@ echo "(autoload 'define-derived-mode \"derived\")" >>$@ echo "(autoload 'encoded-kbd-mode \"encoded-kb\")" >>$@ echo "(defvar cvs-global-menu nil)" >>$@ echo "" >> $@ echo ";;; Local Variables:" >> $@ echo ";;; version-control: never" >> $@ echo ";;; no-byte-compile: t" >> $@ echo ";;; no-update-autoloads: t" >> $@ echo ";;; End:" >> $@ echo ";;; loaddefs.el ends here" >> $@ loaddefs.el-CMD: echo ;;; loaddefs.el --- automatically extracted autoloads> $@ echo ;;; Code:>> $@ echo (autoload 'define-minor-mode "easy-mmode")>> $@ echo (autoload 'define-ccl-program "ccl")>> $@ echo (autoload 'regexp-opt "regexp-opt")>> $@ echo (autoload 'string-to-list "mule-util")>> $@ echo (autoload 'define-derived-mode "derived")>> $@ echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@ echo (defvar cvs-global-menu nil)>> $@ echo ;;; >> $@ echo ;;; Local Variables:>> $@ echo ;;; version-control: never>> $@ echo ;;; no-byte-compile: t>> $@ echo ;;; no-update-autoloads: t>> $@ echo ;;; End:>> $@ echo ;;; loaddefs.el ends here>> $@ autoloads: loaddefs.el doit @echo Directories: $(WINS) $(emacs) -l autoload \ --eval $(ARGQUOTE)(setq find-file-hook nil \ find-file-suppress-same-file-warnings t \ generated-autoload-file \ $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \ -f batch-update-autoloads $(lisp) $(WINS) subdirs.el: $(MAKE) $(MFLAGS) update-subdirs # Need separate version for sh and native cmd.exe update-subdirs: update-subdirs-$(SHELLTYPE) update-subdirs-CMD: doit echo ;; -*- no-byte-compile: t -*->subdirs.el echo ;; In load-path, after this directory should come>> subdirs.el echo ;; certain of its subdirectories. Here we specify them.>> subdirs.el echo (normal-top-level-add-to-load-path $(SQUOTE)(>> subdirs.el @for %%d in ($(WINS)) do if not (%%d)==(term) echo "%%d">> subdirs.el echo ))>> subdirs.el update-subdirs-SH: doit $(srcdir)/update-subdirs $(lisp); \ for file in $(WINS); do \ $(srcdir)/update-subdirs $$file; \ done; updates: update-subdirs autoloads finder-data custom-deps # Update the AUTHORS file. update-authors: $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir) TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(ETAGS) $(lisptagsfiles1) $(lisptagsfiles2) TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(ETAGS) -o TAGS-LISP $(lisptagsfiles1) $(lisptagsfiles2) .SUFFIXES: .elc .el .el.elc: -$(emacs) -f batch-byte-compile $< $(DONTCOMPILE:.el=.elc): -$(DEL) $@ # Compile all Lisp files, except those from DONTCOMPILE, # but don't recompile those that are up to date. # All .elc files are made writable # before compilation in case we checked out read-only (CVS option -r). # Files MUST be compiled one by one. If we compile several files in a # row we can't make sure that the compilation environment is clean. # We also set the load-path of the Emacs used for compilation to the # current directory and its subdirectories, to make sure require's and # load's in the files being compiled find the right files. # Need separate version for sh and native cmd.exe compile: subdirs.el compile-$(SHELLTYPE) doit compile-CMD: # -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g for %%f in ($(COMPILE_FIRST)) do \ $(emacs) -l loaddefs -f batch-byte-compile-if-not-done %%f for %%f in (. $(WINS)) do for %%g in (%%f/*.el) do \ $(emacs) -l loaddefs -f batch-byte-compile-if-not-done %%f/%%g compile-SH: # for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done for el in $(COMPILE_FIRST); do \ echo Compiling $$el; \ $(emacs) -l loaddefs -f batch-byte-compile-if-not-done $$el; \ done for dir in $(lisp) $(WINS); do \ for el in $$dir/*.el; do \ if test -f $$el; \ then \ echo Compiling $$el; \ $(emacs) -l loaddefs -f batch-byte-compile-if-not-done $$el; \ fi \ done; \ done # Compile all Lisp files, except those from DONTCOMPILE. This # is like `compile' but compiles files unconditionally. compile-always: subdirs.el compile-always-$(SHELLTYPE) doit compile-always-CMD: # -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g for %%f in ($(COMPILE_FIRST)) do $(emacs) -f batch-byte-compile %%f for %%f in (. $(WINS)) do for %%g in (%%f/*.el) do $(emacs) -f batch-byte-compile %%f/%%g compile-always-SH: # for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done for el in $(COMPILE_FIRST); do \ echo Compiling $$el; \ $(emacs) -f batch-byte-compile $$el || exit 1; \ done for dir in $(lisp) $(WINS); do \ for el in $$dir/*.el; do \ echo Compiling $$el; \ $(emacs) -f batch-byte-compile $$el || exit 1; \ done; \ done compile-calc: compile-calc-$(SHELLTYPE) compile-calc-CMD: for %%f in ($(lisp)/calc/*.el) do $(emacs) -f batch-byte-compile %%f compile-calc-SH: for el in $(lisp)/calc/*.el; do \ echo Compiling $$el; \ $(emacs) -f batch-byte-compile $$el || exit 1; \ done # Backup compiled Lisp files in elc.tar.gz. If that file already # exists, make a backup of it. backup-compiled-files: -mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~ -tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc # Compile Lisp files, but save old compiled files first. compile-after-backup: backup-compiled-files compile-always # Recompile all Lisp files which are newer than their .elc files. # Note that this doesn't create .elc files. It only recompiles if an # .elc is present. recompile: doit $(emacs) -f batch-byte-recompile-directory $(lisp) # Prepare a bootstrap in the lisp subdirectory. # # Build loaddefs.el, because it's not sure it's up-to-date, and if it's not, # that might lead to errors during the bootstrap because something fails to # autoload as expected. However, if there is no emacs binary, then we can't # build autoloads yet, so just make sure there's some loaddefs.el file, as # it's necessary for generating the binary (because loaddefs.el is an # automatically generated file, we don't want to store it in the source # repository). # # Remove compiled Lisp files so that bootstrap-emacs will be built from # sources only. # Need separate version for sh and native cmd.exe bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el bootstrap-clean-CMD: # if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads if not exist $(lisp)\loaddefs.el cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g bootstrap-clean-SH: # if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc if ! test -r $(lisp)/loaddefs.el; then \ cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \ fi -for dir in . $(WINS); do rm -f $$dir/*.elc; done # Generate/update files for the bootstrap process. bootstrap: update-subdirs autoloads compile finder-data custom-deps # # Assuming INSTALL_DIR is defined, copy the elisp files to it # Windows 95 makes this harder than it should be. # install: - mkdir "$(INSTALL_DIR)/lisp" - $(DEL) ../same-dir.tst - $(DEL) "$(INSTALL_DIR)/same-dir.tst" echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst" #ifdef COPY_LISP_SOURCE $(IFNOTSAMEDIR) $(CP_DIR) . "$(INSTALL_DIR)/lisp" $(ENDIF) #else # $(IFNOTSAMEDIR) $(CP_DIR) *.elc "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) cus-load.el "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) forms*.el "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) patcomp.el "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) subdirs.el "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) version.el "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) mail/blessmail.el "$(INSTALL_DIR)/lisp/mail" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) mail/sc.el "$(INSTALL_DIR)/lisp/mail" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) play/bruce.el "$(INSTALL_DIR)/lisp/play" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) international/latin-*.el "$(INSTALL_DIR)/lisp/international" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) international/mule-conf.el "$(INSTALL_DIR)/lisp/international" $(ENDIF) #endif - $(DEL) ../same-dir.tst - $(DEL) "$(INSTALL_DIR)/same-dir.tst" # # Maintenance # clean: - $(DEL) *~