[Emacs-diffs] Changes to emacs/lisp/makefile.w32-in [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/makefile.w32-in
diff -c emacs/lisp/makefile.w32-in:1.30.6.2 emacs/lisp/makefile.w32-in:1.30.6.3
*** emacs/lisp/makefile.w32-in:1.30.6.2 Fri Apr 16 12:50:07 2004
--- emacs/lisp/makefile.w32-in  Mon Jun 28 07:28:23 2004
***************
*** 1,5 ****
! #  Makefile for GNU Emacs on the Microsoft W32 API.
! #  Copyright (c) 2000-2001 Free Software Foundation, Inc.
  #
  #  This file is part of GNU Emacs.
  #
--- 1,5 ----
! #  -*- 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.
  #
***************
*** 42,50 ****
  # Set EMACSLOADPATH correctly (already defined in environment).
  EMACSLOADPATH=$(lisp)
  
- # Use C locale
- LC_ALL = C
- 
  lisptagsfiles1 = $(lisp)/*.el
  lisptagsfiles2 = $(lisp)/*/*.el
  ETAGS = "../lib-src/$(BLD)/etags"
--- 42,47 ----
***************
*** 65,71 ****
        $(lisp)/forms-d2.el \
        $(lisp)/forms-pass.el \
        $(lisp)/generic-x.el \
!       $(lisp)/international/latin1-disp.el \
        $(lisp)/international/mule-conf.el \
        $(lisp)/language/czech.el \
        $(lisp)/language/devanagari.el \
--- 62,74 ----
        $(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 \
***************
*** 84,93 ****
        $(lisp)/language/thai.el \
        $(lisp)/language/utf-8-lang.el \
        $(lisp)/language/georgian.el \
-       $(lisp)/language/vietnamese.el \
-       $(lisp)/language/cyrillic.el \
-       $(lisp)/language/chinese.el \
-       $(lisp)/language/indian.el \
        $(lisp)/loaddefs.el \
        $(lisp)/ldefs-boot.el \
        $(lisp)/loadup.el \
--- 87,92 ----
***************
*** 162,168 ****
        progmodes \
        term \
        textmodes \
!       toolbar
  
  doit:
  
--- 161,168 ----
        progmodes \
        term \
        textmodes \
!       toolbar \
!       url
  
  doit:
  
***************
*** 237,243 ****
        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
--- 237,243 ----
        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
***************
*** 282,292 ****
  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
--- 282,292 ----
  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
***************
*** 309,317 ****
  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
--- 309,317 ----
  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
***************
*** 329,335 ****
  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 \
--- 329,335 ----
  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 \
***************
*** 374,380 ****
  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
--- 374,380 ----
  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
***************
*** 420,424 ****
  #
  clean:
                - $(DEL) *~
- 
- # arch-tag: bd03b562-c58d-4403-99db-c7bccd8c49a0
--- 420,422 ----