Show
Ignore:
Timestamp:
2008年04月04日 22時04分40秒 (8 months ago)
Author:
miyoshi
Message:

Sync up with Emacs22.2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib-src/makefile.w32-in

    r4213 r4220  
    11#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. 
    22#  Copyright (C) 2000, 2001, 2002, 2003, 2004, 
    3 #                2005, 2006, 2007 Free Software Foundation, Inc. 
     3#                2005, 2006, 2007, 2008 Free Software Foundation, Inc. 
    44# 
    55#  This file is part of GNU Emacs. 
    …… 
    77#  GNU Emacs is free software; you can redistribute it and/or modify 
    88#  it under the terms of the GNU General Public License as published by 
    9 #  the Free Software Foundation; either version 2, or (at your option) 
     9#  the Free Software Foundation; either version 3, or (at your option) 
    1010#  any later version. 
    1111# 
    …… 
    2525.PHONY: $(ALL) 
    2626 
    27 VERSION         = 22.1 
     27VERSION         = 22.2 
    2828 
    2929LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ 
    …… 
    8383$(BLD)/emacsclient.exe:         $(ECLIENTOBJS) 
    8484# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 
    85                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS) 
     85                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) 
    8686 
    8787$(BLD)/emacsclientw.exe:        $(ECLIENTOBJS) $(TRES) 
    8888# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 
    89                 $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS) 
     89                $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) 
    9090 
    9191# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in 
    …… 
    325325# Maintenance 
    326326# 
     327# We used to delete *~ here, but that might inadvertently remove 
     328# precious files if it happens to match their short 8+3 aliases. 
    327329clean: 
    328                 - $(DEL) *~ DOC* $(COMPILER_TEMP_FILES) 
     330                - $(DEL) DOC* $(COMPILER_TEMP_FILES) 
    329331                - $(DEL) ctags.c 
    330332                - $(DEL) getopt.h