annotate nt/tiff.mak @ 4952:19a72041c5ed

Mule-izing, various fixes related to char * arguments -------------------- ChangeLog entries follow: -------------------- modules/ChangeLog addition: 2010-01-26 Ben Wing <ben@xemacs.org> * postgresql/postgresql.c: * postgresql/postgresql.c (CHECK_LIVE_CONNECTION): * postgresql/postgresql.c (print_pgresult): * postgresql/postgresql.c (Fpq_conn_defaults): * postgresql/postgresql.c (Fpq_connectdb): * postgresql/postgresql.c (Fpq_connect_start): * postgresql/postgresql.c (Fpq_result_status): * postgresql/postgresql.c (Fpq_res_status): Mule-ize large parts of it. 2010-01-26 Ben Wing <ben@xemacs.org> * ldap/eldap.c (print_ldap): * ldap/eldap.c (allocate_ldap): Use write_ascstring(). src/ChangeLog addition: 2010-01-26 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (build_ascstring): * alloc.c (build_msg_cistring): * alloc.c (staticpro_1): * alloc.c (staticpro_name): * alloc.c (staticpro_nodump_1): * alloc.c (staticpro_nodump_name): * alloc.c (unstaticpro_nodump_1): * alloc.c (mcpro_1): * alloc.c (mcpro_name): * alloc.c (object_memory_usage_stats): * alloc.c (common_init_alloc_early): * alloc.c (init_alloc_once_early): * buffer.c (print_buffer): * buffer.c (vars_of_buffer): * buffer.c (common_init_complex_vars_of_buffer): * buffer.c (init_initial_directory): * bytecode.c (invalid_byte_code): * bytecode.c (print_compiled_function): * bytecode.c (mark_compiled_function): * chartab.c (print_table_entry): * chartab.c (print_char_table): * config.h.in: * console-gtk.c: * console-gtk.c (gtk_device_to_console_connection): * console-gtk.c (gtk_semi_canonicalize_console_connection): * console-gtk.c (gtk_canonicalize_console_connection): * console-gtk.c (gtk_semi_canonicalize_device_connection): * console-gtk.c (gtk_canonicalize_device_connection): * console-stream.c (stream_init_frame_1): * console-stream.c (vars_of_console_stream): * console-stream.c (init_console_stream): * console-x.c (x_semi_canonicalize_console_connection): * console-x.c (x_semi_canonicalize_device_connection): * console-x.c (x_canonicalize_device_connection): * console-x.h: * data.c (eq_with_ebola_notice): * data.c (Fsubr_interactive): * data.c (Fnumber_to_string): * data.c (digit_to_number): * device-gtk.c (gtk_init_device): * device-msw.c (print_devmode): * device-x.c (x_event_name): * dialog-msw.c (handle_directory_dialog_box): * dialog-msw.c (handle_file_dialog_box): * dialog-msw.c (vars_of_dialog_mswindows): * doc.c (weird_doc): * doc.c (Fsnarf_documentation): * doc.c (vars_of_doc): * dumper.c (pdump): * dynarr.c: * dynarr.c (Dynarr_realloc): * editfns.c (Fuser_real_login_name): * editfns.c (get_home_directory): * elhash.c (print_hash_table_data): * elhash.c (print_hash_table): * emacs.c (main_1): * emacs.c (vars_of_emacs): * emodules.c: * emodules.c (_emodules_list): * emodules.c (Fload_module): * emodules.c (Funload_module): * emodules.c (Flist_modules): * emodules.c (find_make_module): * emodules.c (attempt_module_delete): * emodules.c (emodules_load): * emodules.c (emodules_doc_subr): * emodules.c (emodules_doc_sym): * emodules.c (syms_of_module): * emodules.c (vars_of_module): * emodules.h: * eval.c (print_subr): * eval.c (signal_call_debugger): * eval.c (build_error_data): * eval.c (signal_error): * eval.c (maybe_signal_error): * eval.c (signal_continuable_error): * eval.c (maybe_signal_continuable_error): * eval.c (signal_error_2): * eval.c (maybe_signal_error_2): * eval.c (signal_continuable_error_2): * eval.c (maybe_signal_continuable_error_2): * eval.c (signal_ferror): * eval.c (maybe_signal_ferror): * eval.c (signal_continuable_ferror): * eval.c (maybe_signal_continuable_ferror): * eval.c (signal_ferror_with_frob): * eval.c (maybe_signal_ferror_with_frob): * eval.c (signal_continuable_ferror_with_frob): * eval.c (maybe_signal_continuable_ferror_with_frob): * eval.c (syntax_error): * eval.c (syntax_error_2): * eval.c (maybe_syntax_error): * eval.c (sferror): * eval.c (sferror_2): * eval.c (maybe_sferror): * eval.c (invalid_argument): * eval.c (invalid_argument_2): * eval.c (maybe_invalid_argument): * eval.c (invalid_constant): * eval.c (invalid_constant_2): * eval.c (maybe_invalid_constant): * eval.c (invalid_operation): * eval.c (invalid_operation_2): * eval.c (maybe_invalid_operation): * eval.c (invalid_change): * eval.c (invalid_change_2): * eval.c (maybe_invalid_change): * eval.c (invalid_state): * eval.c (invalid_state_2): * eval.c (maybe_invalid_state): * eval.c (wtaerror): * eval.c (stack_overflow): * eval.c (out_of_memory): * eval.c (print_multiple_value): * eval.c (issue_call_trapping_problems_warning): * eval.c (backtrace_specials): * eval.c (backtrace_unevalled_args): * eval.c (Fbacktrace): * eval.c (warn_when_safe): * event-Xt.c (modwarn): * event-Xt.c (modbarf): * event-Xt.c (check_modifier): * event-Xt.c (store_modifier): * event-Xt.c (emacs_Xt_format_magic_event): * event-Xt.c (describe_event): * event-gtk.c (dragndrop_data_received): * event-gtk.c (store_modifier): * event-gtk.c (gtk_reset_modifier_mapping): * event-msw.c (dde_eval_string): * event-msw.c (Fdde_alloc_advise_item): * event-msw.c (mswindows_dde_callback): * event-msw.c (FROB): * event-msw.c (emacs_mswindows_format_magic_event): * event-stream.c (external_debugging_print_event): * event-stream.c (execute_help_form): * event-stream.c (vars_of_event_stream): * events.c (print_event_1): * events.c (print_event): * events.c (event_equal): * extents.c (print_extent_1): * extents.c (print_extent): * extents.c (vars_of_extents): * faces.c (print_face): * faces.c (complex_vars_of_faces): * file-coding.c: * file-coding.c (print_coding_system): * file-coding.c (print_coding_system_in_print_method): * file-coding.c (default_query_method): * file-coding.c (find_coding_system): * file-coding.c (make_coding_system_1): * file-coding.c (chain_print): * file-coding.c (undecided_print): * file-coding.c (gzip_print): * file-coding.c (vars_of_file_coding): * file-coding.c (complex_vars_of_file_coding): * fileio.c: * fileio.c (report_file_type_error): * fileio.c (report_error_with_errno): * fileio.c (report_file_error): * fileio.c (barf_or_query_if_file_exists): * fileio.c (vars_of_fileio): * floatfns.c (matherr): * fns.c (print_bit_vector): * fns.c (Fmapconcat): * fns.c (add_suffix_to_symbol): * fns.c (add_prefix_to_symbol): * frame-gtk.c: * frame-gtk.c (Fgtk_window_id): * frame-x.c (def): * frame-x.c (x_cde_transfer_callback): * frame.c: * frame.c (Fmake_frame): * gc.c (show_gc_cursor_and_message): * gc.c (vars_of_gc): * glyphs-eimage.c (png_instantiate): * glyphs-eimage.c (tiff_instantiate): * glyphs-gtk.c (gtk_print_image_instance): * glyphs-msw.c (mswindows_print_image_instance): * glyphs-x.c (x_print_image_instance): * glyphs-x.c (update_widget_face): * glyphs.c (make_string_from_file): * glyphs.c (print_image_instance): * glyphs.c (signal_image_error): * glyphs.c (signal_image_error_2): * glyphs.c (signal_double_image_error): * glyphs.c (signal_double_image_error_2): * glyphs.c (xbm_mask_file_munging): * glyphs.c (pixmap_to_lisp_data): * glyphs.h: * gui.c (gui_item_display_flush_left): * hpplay.c (player_error_internal): * hpplay.c (myHandler): * intl-win32.c: * intl-win32.c (langcode_to_lang): * intl-win32.c (sublangcode_to_lang): * intl-win32.c (Fmswindows_get_locale_info): * intl-win32.c (lcid_to_locale_mule_or_no): * intl-win32.c (mswindows_multibyte_to_unicode_print): * intl-win32.c (complex_vars_of_intl_win32): * keymap.c: * keymap.c (print_keymap): * keymap.c (ensure_meta_prefix_char_keymapp): * keymap.c (Fkey_description): * keymap.c (Ftext_char_description): * lisp.h: * lisp.h (struct): * lisp.h (DECLARE_INLINE_HEADER): * lread.c (Fload_internal): * lread.c (locate_file): * lread.c (read_escape): * lread.c (read_raw_string): * lread.c (read1): * lread.c (read_list): * lread.c (read_compiled_function): * lread.c (init_lread): * lrecord.h: * marker.c (print_marker): * marker.c (marker_equal): * menubar-msw.c (displayable_menu_item): * menubar-x.c (command_builder_operate_menu_accelerator): * menubar.c (vars_of_menubar): * minibuf.c (reinit_complex_vars_of_minibuf): * minibuf.c (complex_vars_of_minibuf): * mule-charset.c (Fmake_charset): * mule-charset.c (complex_vars_of_mule_charset): * mule-coding.c (iso2022_print): * mule-coding.c (fixed_width_query): * number.c (bignum_print): * number.c (ratio_print): * number.c (bigfloat_print): * number.c (bigfloat_finalize): * objects-msw.c: * objects-msw.c (mswindows_color_to_string): * objects-msw.c (mswindows_color_list): * objects-tty.c: * objects-tty.c (tty_font_list): * objects-tty.c (tty_find_charset_font): * objects-xlike-inc.c (xft_find_charset_font): * objects-xlike-inc.c (endif): * print.c: * print.c (write_istring): * print.c (write_ascstring): * print.c (Fterpri): * print.c (Fprint): * print.c (print_error_message): * print.c (print_vector_internal): * print.c (print_cons): * print.c (print_string): * print.c (printing_unreadable_object): * print.c (print_internal): * print.c (print_float): * print.c (print_symbol): * process-nt.c (mswindows_report_winsock_error): * process-nt.c (nt_canonicalize_host_name): * process-unix.c (unix_canonicalize_host_name): * process.c (print_process): * process.c (report_process_error): * process.c (report_network_error): * process.c (make_process_internal): * process.c (Fstart_process_internal): * process.c (status_message): * process.c (putenv_internal): * process.c (vars_of_process): * process.h: * profile.c (vars_of_profile): * rangetab.c (print_range_table): * realpath.c (vars_of_realpath): * redisplay.c (vars_of_redisplay): * search.c (wordify): * search.c (Freplace_match): * sheap.c (sheap_adjust_h): * sound.c (report_sound_error): * sound.c (Fplay_sound_file): * specifier.c (print_specifier): * symbols.c (Fsubr_name): * symbols.c (do_symval_forwarding): * symbols.c (set_default_buffer_slot_variable): * symbols.c (set_default_console_slot_variable): * symbols.c (store_symval_forwarding): * symbols.c (default_value): * symbols.c (defsymbol_massage_name_1): * symbols.c (defsymbol_massage_name_nodump): * symbols.c (defsymbol_massage_name): * symbols.c (defsymbol_massage_multiword_predicate_nodump): * symbols.c (defsymbol_massage_multiword_predicate): * symbols.c (defsymbol_nodump): * symbols.c (defsymbol): * symbols.c (defkeyword): * symbols.c (defkeyword_massage_name): * symbols.c (check_module_subr): * symbols.c (deferror_1): * symbols.c (deferror): * symbols.c (deferror_massage_name): * symbols.c (deferror_massage_name_and_message): * symbols.c (defvar_magic): * symeval.h: * symeval.h (DEFVAR_SYMVAL_FWD): * sysdep.c: * sysdep.c (init_system_name): * sysdll.c: * sysdll.c (MAYBE_PREPEND_UNDERSCORE): * sysdll.c (dll_function): * sysdll.c (dll_variable): * sysdll.c (dll_error): * sysdll.c (dll_open): * sysdll.c (dll_close): * sysdll.c (image_for_address): * sysdll.c (my_find_image): * sysdll.c (search_linked_libs): * sysdll.h: * sysfile.h: * sysfile.h (DEFAULT_DIRECTORY_FALLBACK): * syswindows.h: * tests.c (DFC_CHECK_LENGTH): * tests.c (DFC_CHECK_CONTENT): * tests.c (Ftest_hash_tables): * text.c (vars_of_text): * text.h: * tooltalk.c (tt_opnum_string): * tooltalk.c (tt_message_arg_ival_string): * tooltalk.c (Ftooltalk_default_procid): * tooltalk.c (Ftooltalk_default_session): * tooltalk.c (init_tooltalk): * tooltalk.c (vars_of_tooltalk): * ui-gtk.c (Fdll_load): * ui-gtk.c (type_to_marshaller_type): * ui-gtk.c (Fgtk_import_function_internal): * ui-gtk.c (emacs_gtk_object_printer): * ui-gtk.c (emacs_gtk_boxed_printer): * unicode.c (unicode_to_ichar): * unicode.c (unicode_print): * unicode.c (unicode_query): * unicode.c (vars_of_unicode): * unicode.c (complex_vars_of_unicode): * win32.c: * win32.c (mswindows_report_process_error): * window.c (print_window): * xemacs.def.in.in: BASIC IDEA: Further fixing up uses of char * and CIbyte * to reflect their actual semantics; Mule-izing some code; redoing of the not-yet-working code to handle message translation. Clean up code to handle message-translation (not yet working). Create separate versions of build_msg_string() for working with Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte * arguments are pure-ASCII. Make build_msg_string() be the same as build_msg_ascstring(). Create same three versions of GETTEXT() and DEFER_GETTEXT(). Also create build_defer_string() and variants for the equivalent of DEFER_GETTEXT() when building a string. Remove old CGETTEXT(). Clean up code where GETTEXT(), DEFER_GETTEXT(), build_msg_string(), etc. was being called and introduce some new calls to build_msg_string(), etc. Remove GETTEXT() from calls to weird_doc() -- we assume that the message snarfer knows about weird_doc(). Remove uses of DEFER_GETTEXT() from error messages in sysdep.c and instead use special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */ that the message snarfer presumably knows about. Create build_ascstring() and use it in many instances in place of build_string(). The purpose of having Ascbyte * variants is to make the code more self-documenting in terms of what sort of semantics is expected for char * strings. In fact in the process of looking for uses of build_string(), much improperly Mule-ized was discovered. Mule-ize a lot of code as described in previous paragraph, e.g. in sysdep.c. Make the error functions take Ascbyte * strings and fix up a couple of places where non-pure-ASCII strings were being passed in (file-coding.c, mule-coding.c, unicode.c). (It's debatable whether we really need to make the error functions work this way. It helps catch places where code is written in a way that message translation won't work, but we may well never implement message translation.) Make staticpro() and friends take Ascbyte * strings instead of raw char * strings. Create a const_Ascbyte_ptr dynarr type to describe what's held by staticpro_names[] and friends, create pdump descriptions for const_Ascbyte_ptr dynarrs, and use them in place of specially-crafted staticpro descriptions. Mule-ize certain other functions (e.g. x_event_name) by correcting raw use of char * to Ascbyte *, Rawbyte * or another such type, and raw use of char[] buffers to another type (usually Ascbyte[]). Change many uses of write_c_string() to write_msg_string(), write_ascstring(), etc. Mule-ize emodules.c, emodules.h, sysdll.h. Fix some un-Mule-ized code in intl-win32.c. A comment in event-Xt.c and the limitations of the message snarfer (make-msgfile or whatever) is presumably incorrect -- it should be smart enough to handle function calls spread over more than one line. Clean up code in event-Xt.c that was written awkwardly for this reason. In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES, create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to indicate when inlined functions need to be declared in xemacs.defs.in.in, and make use of it in xemacs.defs.in.in. We need to do this because postgresql.c now calls qxestrdup(), which is an inline function. Make nconc2() and other such functions MODULE_API and put them in xemacs.defs.in.in since postgresql.c now uses them. Clean up indentation in lread.c and a few other places. In text.h, document ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in encodings and add some more for DLL symbols, function and variable names, etc.
author Ben Wing <ben@xemacs.org>
date Tue, 26 Jan 2010 23:22:30 -0600
parents afd57c14dfc8
children 03ab78e48ef6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
318
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
1 #
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
2 # TIFF makefile for Microsoft nmake
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
3 #
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
4 !if !defined(DEBUG_XEMACS)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
5 DEBUG_XEMACS=0
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
6 !endif
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
7
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
8 !if $(DEBUG_XEMACS)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
9 OPT=-Od -Zi
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
10 !else
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
11 OPT=-O2 -G5
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
12 !endif
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
13
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
14 WARN_CPP_FLAGS = -W3
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
15 CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) -c
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
16
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
17 OUTDIR=.\WinRel
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
18 OBJDIR=.\WinRel
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
19 # the following is because fax3sm.c references "tiff.h" and "tif_fax3.h",
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
20 # under the assumption that those header files are in the same directory
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
21 # as fax3sm.c But, since we're using a special fax3sm.c file, and we
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
22 # can't be sure the user has patch to change "xx" to "..\..\libtiff\xx",
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
23 # let's just copy these header files to this directory. (Symbolic links
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
24 # would be _so_ nice)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
25 NEED_FOR_COMPILE= tiff.h tif_fax3.h
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
26
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
27 CPP=cl.exe
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
28 CPP_PROJ= /GX /YX /I "." /I ".." /D "WIN32" /D "NDEBUG" /D\
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
29 "_WINDOWS" /FR$(OBJDIR)/ /Fp$(OUTDIR)/"libtiff.pch" $(CFLAGS)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
30
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
31 BSC32=bscmake.exe
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
32 BSC32_FLAGS=/nologo /o$(OUTDIR)/libtiff.bsc
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
33
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
34 LIB32=lib.exe
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
35 LIB32_FLAGS=/NOLOGO /OUT:$(OUTDIR)\libtiff.lib
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
36 DEF_FLAGS=
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
37 DEF_FILE=
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
38
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
39 BSC32_SBRS= \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
40 $(OBJDIR)\tif_jpeg.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
41 $(OBJDIR)\tif_dirinfo.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
42 $(OBJDIR)\tif_win32.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
43 $(OBJDIR)\tif_flush.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
44 $(OBJDIR)\tif_thunder.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
45 $(OBJDIR)\tif_compress.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
46 $(OBJDIR)\tif_print.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
47 $(OBJDIR)\tif_dirread.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
48 $(OBJDIR)\tif_getimage.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
49 $(OBJDIR)\tif_fax3.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
50 $(OBJDIR)\tif_version.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
51 $(OBJDIR)\tif_codec.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
52 $(OBJDIR)\tif_dir.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
53 $(OBJDIR)\tif_predict.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
54 $(OBJDIR)\tif_close.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
55 $(OBJDIR)\tif_dumpmode.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
56 $(OBJDIR)\tif_aux.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
57 $(OBJDIR)\tif_error.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
58 $(OBJDIR)\tif_lzw.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
59 $(OBJDIR)\tif_zip.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
60 $(OBJDIR)\tif_read.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
61 $(OBJDIR)\tif_packbits.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
62 $(OBJDIR)\tif_swab.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
63 $(OBJDIR)\tif_dirwrite.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
64 $(OBJDIR)\tif_open.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
65 $(OBJDIR)\tif_warning.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
66 $(OBJDIR)\tif_tile.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
67 $(OBJDIR)\tif_strip.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
68 $(OBJDIR)\tif_next.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
69 $(OBJDIR)\tif_write.sbr \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
70 $(OBJDIR)\fax3sm.sbr
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
71
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
72 LIB32_OBJS= \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
73 $(OBJDIR)\tif_jpeg.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
74 $(OBJDIR)\tif_dirinfo.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
75 $(OBJDIR)\tif_win32.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
76 $(OBJDIR)\tif_flush.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
77 $(OBJDIR)\tif_thunder.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
78 $(OBJDIR)\tif_compress.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
79 $(OBJDIR)\tif_print.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
80 $(OBJDIR)\tif_dirread.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
81 $(OBJDIR)\tif_getimage.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
82 $(OBJDIR)\tif_fax3.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
83 $(OBJDIR)\tif_version.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
84 $(OBJDIR)\tif_codec.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
85 $(OBJDIR)\tif_dir.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
86 $(OBJDIR)\tif_predict.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
87 $(OBJDIR)\tif_close.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
88 $(OBJDIR)\tif_dumpmode.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
89 $(OBJDIR)\tif_aux.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
90 $(OBJDIR)\tif_error.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
91 $(OBJDIR)\tif_lzw.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
92 $(OBJDIR)\tif_zip.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
93 $(OBJDIR)\tif_read.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
94 $(OBJDIR)\tif_packbits.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
95 $(OBJDIR)\tif_swab.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
96 $(OBJDIR)\tif_dirwrite.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
97 $(OBJDIR)\tif_open.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
98 $(OBJDIR)\tif_warning.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
99 $(OBJDIR)\tif_tile.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
100 $(OBJDIR)\tif_strip.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
101 $(OBJDIR)\tif_next.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
102 $(OBJDIR)\tif_write.obj \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
103 $(OBJDIR)\fax3sm.obj
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
104
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
105 # nmake rule
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
106
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
107 .SUFFIXES:
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
108 .SUFFIXES: .c .obj
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
109
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
110 {..\..\libtiff}.c{$(OBJDIR)}.obj:
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
111 $(CPP) $(CPP_PROJ) $< -Fo$@
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
112
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
113
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
114 ALL : $(OUTDIR)/libtiff.lib $(OUTDIR)/libtiff.bsc
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
115
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
116 clean :
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
117 -del tiff.h
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
118 -del tif_fax3.h
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
119 -del t4.h
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
120 -del tiffcomp.h
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
121 -del tiffconf.h
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
122 -del tiffio.h
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
123 -del ..\..\libtiff\libtiff.lib
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
124 -del *.pdb
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
125 -del $(OBJDIR)\*.obj
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
126 -del $(OBJDIR)\*.sbr
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
127 -del $(OUTDIR)\libtiff.lib
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
128 -del $(OUTDIR)\libtiff.bsc
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
129 -del $(OUTDIR)\libtiff.pch
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
130 -rmdir $(OUTDIR)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
131
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
132 tiff.h :
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
133 if not exist ./tiff.h copy ..\..\libtiff\tiff.h .
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
134 tif_fax3.h :
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
135 if not exist ./tif_fax3.h copy ..\..\libtiff\tif_fax3.h .
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
136
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
137 $(OUTDIR) : $(NEED_FOR_COMPILE)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
138 if not exist $(OUTDIR)/nul mkdir $(OUTDIR)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
139
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
140 $(OUTDIR)/libtiff.bsc : $(OUTDIR) $(BSC32_SBRS)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
141 $(BSC32) @<<
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
142 $(BSC32_FLAGS) $(BSC32_SBRS)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
143 <<
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
144
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
145 $(OUTDIR)/libtiff.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
146 $(LIB32) @<<
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
147 $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
148 <<
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
149 copy $(OUTDIR)\libtiff.lib ..\..\libtiff\libtiff.lib
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
150
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
151 DEP_FAX3S=\
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
152 ..\..\libtiff\tiff.h \
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
153 ..\..\libtiff\tif_fax3.h
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
154 $(OBJDIR)/fax3sm.obj : $(DEP_FAX3S) $(OBJDIR)
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
155 $(CPP) $(CPP_PROJ) .\fax3sm.c -Fo$@
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents:
diff changeset
156