To: vim-dev@vim.org
Subject: Patch 6.2f.015 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.2f.015 (extra)
Problem:    Win32: When changing header files not all source files involved
	    are recompiled.
Solution:   Improve the dependency rules. (Dan Sharp)
Files:	    src/Make_cyg.mak, src/Make_ming.mak


*** ../vim-6.2f.014/src/Make_cyg.mak	Mon May 26 22:15:06 2003
--- src/Make_cyg.mak	Tue May 27 21:15:20 2003
***************
*** 413,422 ****
  $(OUTDIR)/if_ruby.o:	if_ruby.c $(INCL)
  	$(CC) -c $(CFLAGS) -U_WIN32 if_ruby.c -o $(OUTDIR)/if_ruby.o
  
! $(OUTDIR)/vimrc.o:	vim.rc $(INCL)
  	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
  
! pathdef.c:
  ifneq (sh.exe, $(SHELL))
  	@echo creating pathdef.c
  	@echo '/* pathdef.c */' > pathdef.c
--- 413,422 ----
  $(OUTDIR)/if_ruby.o:	if_ruby.c $(INCL)
  	$(CC) -c $(CFLAGS) -U_WIN32 if_ruby.c -o $(OUTDIR)/if_ruby.o
  
! $(OUTDIR)/vimrc.o:	vim.rc version.h gui_w32_rc.h
  	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
  
! pathdef.c: $(INCL)
  ifneq (sh.exe, $(SHELL))
  	@echo creating pathdef.c
  	@echo '/* pathdef.c */' > pathdef.c
*** ../vim-6.2f.014/src/Make_ming.mak	Mon May 26 22:15:06 2003
--- src/Make_ming.mak	Tue May 27 21:15:20 2003
***************
*** 453,485 ****
  	$(MAKE) -C xxd -f Make_cyg.mak clean
  
  ###########################################################################
  $(OUTDIR)/%.o : %.c $(INCL)
  	$(CC) -c $(CFLAGS) $< -o $@
  
! $(OUTDIR)/vimres.res: vim.rc
  	$(WINDRES) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
  
  $(OUTDIR)/vimrc.o: $(OUTDIR)/vimres.res
  	$(WINDRES) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
  
- INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
- 	structs.h regexp.h option.h ex_cmds.h proto.h globals.h farsi.h \
- 	gui.h
- 
  $(OUTDIR):
  	mkdir $(OUTDIR)
  
! $(OUTDIR)/if_ole.o: if_ole.cpp
  	$(CC) $(CFLAGS) -D__IID_DEFINED__ -c -o $(OUTDIR)/if_ole.o if_ole.cpp
  
! $(OUTDIR)/if_ruby.o: if_ruby.c
  	$(CC) $(CFLAGS) -U_WIN32 -c -o $(OUTDIR)/if_ruby.o if_ruby.c
  
  if_perl.c: if_perl.xs typemap
  	perl $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
  	     $(PERLLIB)/ExtUtils/typemap if_perl.xs > $@
  
! pathdef.c:
  ifneq (sh.exe, $(SHELL))
  	@echo creating pathdef.c
  	@echo '/* pathdef.c */' > pathdef.c
--- 453,494 ----
  	$(MAKE) -C xxd -f Make_cyg.mak clean
  
  ###########################################################################
+ INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
+ 	structs.h regexp.h option.h ex_cmds.h proto.h globals.h farsi.h \
+ 	gui.h
+ 
  $(OUTDIR)/%.o : %.c $(INCL)
  	$(CC) -c $(CFLAGS) $< -o $@
  
! $(OUTDIR)/vimres.res: vim.rc version.h gui_w32_rc.h
  	$(WINDRES) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
  
  $(OUTDIR)/vimrc.o: $(OUTDIR)/vimres.res
  	$(WINDRES) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
  
  $(OUTDIR):
  	mkdir $(OUTDIR)
  
! $(OUTDIR)/ex_docmd.o:	ex_docmd.c $(INCL) ex_cmds.h
! 	$(CC) -c $(CFLAGS) ex_docmd.c -o $(OUTDIR)/ex_docmd.o
! 
! $(OUTDIR)/ex_eval.o:	ex_eval.c $(INCL) ex_cmds.h
! 	$(CC) -c $(CFLAGS) ex_eval.c -o $(OUTDIR)/ex_eval.o
! 
! $(OUTDIR)/if_cscope.o:	if_cscope.c $(INCL) if_cscope.h
! 	$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
! 
! $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
  	$(CC) $(CFLAGS) -D__IID_DEFINED__ -c -o $(OUTDIR)/if_ole.o if_ole.cpp
  
! $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
  	$(CC) $(CFLAGS) -U_WIN32 -c -o $(OUTDIR)/if_ruby.o if_ruby.c
  
  if_perl.c: if_perl.xs typemap
  	perl $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
  	     $(PERLLIB)/ExtUtils/typemap if_perl.xs > $@
  
! pathdef.c: $(INCL)
  ifneq (sh.exe, $(SHELL))
  	@echo creating pathdef.c
  	@echo '/* pathdef.c */' > pathdef.c
*** ../vim-6.2f.014/src/version.c	Wed May 28 21:18:35 2003
--- src/version.c	Thu May 29 13:20:42 2003
***************
*** 632,633 ****
--- 632,635 ----
  {   /* Add new patch number below this line */
+ /**/
+     15,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
21. Your dog has its own home page.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///