added dependency handling to Makefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 4911c00df735777dcb0c1e522b479258fc2c3bff..02461c972607c1420ad9ee3580ff4efd9a541b0d 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -18,7 +18,9 @@ DATAFILES = data/about.htm data/logo.png
 
 PROGRAM=about
 
 
 PROGRAM=about
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index 6189ec355e239afd5a94a5026c13d25233801d3f..1f43668538e767fe6acbeba6fc020154fd4268f2 100644 (file)
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -22,7 +22,9 @@ DATAFILES = helpfiles/Index.hhk helpfiles/book1.htm helpfiles/book2.htm \
 
 PROGRAM=help
 
 
 PROGRAM=help
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index f07afcab8ca19483526b373c09e366e50ba046dd..f744e9f56254a680fbe560ca766dd50a853608d0 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -19,7 +19,9 @@ DATAFILES = test.zip
 
 PROGRAM=helpview
 
 
 PROGRAM=helpview
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index a976563353e4589baadae61a828b0b11b1288926..01761a8fe4ea5eced2fd199a528a7035be74380f 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -17,7 +17,9 @@ DATAFILES = test.htm
 
 PROGRAM=printing
 
 
 PROGRAM=printing
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 0ce0382be12e8e407179ce1cdf197e8e21620633..f22949fe095dae3fa8965b33e376d4f41819ae07 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -15,10 +15,12 @@ program_dir = samples/html/test
 
 PROGRAM=test
 
 
 PROGRAM=test
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 DATAFILES=f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp \
     tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm
 
 include ../../../src/makeprog.env
 
 
 DATAFILES=f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp \
     tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index ecba39d17f011dadc86e8f88c836dd1be2de7f7f..34544f563e235eef10065d74a88c8ec627b21fe3 100644 (file)
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -15,9 +15,11 @@ program_dir = samples/html/virtual
 
 PROGRAM=virtual
 
 
 PROGRAM=virtual
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 DATAFILES=start.htm
 
 include ../../../src/makeprog.env
 
 
 DATAFILES=start.htm
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index b6872a473c5810f578439a943ccd486ca06c39b7..8c9d675ed2f514a29ea25e8618e9c4ec42f9bce7 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -15,9 +15,11 @@ program_dir = samples/html/widget
 
 PROGRAM=widget
 
 
 PROGRAM=widget
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 DATAFILES=start.htm
 
 include ../../../src/makeprog.env
 
 
 DATAFILES=start.htm
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 25041a89267745a51de496ffc1e4e576213eabd8..c88cd40105ad86fc54be8211f7d42e51520c47cb 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -15,9 +15,11 @@ program_dir = samples/html/zip
 
 PROGRAM=zip
 
 
 PROGRAM=zip
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 DATAFILES=pages.zip start.htm
 
 include ../../../src/makeprog.env
 
 
 DATAFILES=pages.zip start.htm
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index 99fbe8b50ae997608e5d5bd3b3b682235785a969..952ae872752cc457ff6d71ac0ec9c32f8d277c8a 100644 (file)
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -17,7 +17,9 @@ PROGRAM=cube
 
 LIBRARIES=$(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(OPENGLLIBS)
 
 
 LIBRARIES=$(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(OPENGLLIBS)
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)
\ No newline at end of file

diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index 90891fbdb72176f4e0dc8b3d48b2518503f65f7a..f4aa205b1f1d1bf459c8f764cefb7f9e4e8d9501 100644 (file)
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -19,7 +19,9 @@ PROGRAM=isosurf
 
 LIBRARIES=$(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(OPENGLLIBS)
 
 
 LIBRARIES=$(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(OPENGLLIBS)
 

-OBJECTS=$(PROGRAM).o
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 5b838e308d07bcfccfaa3f78ad7a1d738751f6f6..4c911c4041da77f61d1a4cb8fa9fb64094b599bc 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -19,7 +19,9 @@ PROGRAM=penguin
 
 LIBRARIES=$(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(OPENGLLIBS)
 
 
 LIBRARIES=$(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(OPENGLLIBS)
 

-OBJECTS=$(PROGRAM).o lw.o trackball.o
+OBJECTS =$(PROGRAM).o lw.o trackball.o
+DEPFILES=$(PROGRAM).d lw.d trackball.d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/utils/HelpGen/src/Makefile.in b/utils/HelpGen/src/Makefile.in
index f416f20904b69184411485e41ef200f26e7463f5..ae2b0f3a8c9d16803afb0635fee6ee6a29818972 100644 (file)
--- a/utils/HelpGen/src/Makefile.in
+++ b/utils/HelpGen/src/Makefile.in
@@ -13,6 +13,10 @@ PROGRAM=HelpGen
 OBJECTS = HelpGen.o cjparser.o docripper.o ifcontext.o markup.o \
           scriptbinder.o sourcepainter.o srcparser.o \
           wx_extra_imps.o
 OBJECTS = HelpGen.o cjparser.o docripper.o ifcontext.o markup.o \
           scriptbinder.o sourcepainter.o srcparser.o \
           wx_extra_imps.o

+DEPFILES= HelpGen.d cjparser.d docripper.d ifcontext.d markup.d \
+          scriptbinder.d sourcepainter.d srcparser.d \
+          wx_extra_imps.d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/utils/dialoged/src/Makefile.in b/utils/dialoged/src/Makefile.in
index e67ec92be13eed8cd78041a46b64acb1c181dfb3..b6894097ff2fa898c9d3ba35923d68b4a7878586 100644 (file)
--- a/utils/dialoged/src/Makefile.in
+++ b/utils/dialoged/src/Makefile.in
@@ -16,6 +16,8 @@ program_dir = utils/dialoged/src
 PROGRAM=DialogEd
 
 OBJECTS = dialoged.o dlghndlr.o edlist.o edtree.o reseditr.o reswrite.o symbtabl.o winprop.o winstyle.o
 PROGRAM=DialogEd
 
 OBJECTS = dialoged.o dlghndlr.o edlist.o edtree.o reseditr.o reswrite.o symbtabl.o winprop.o winstyle.o

+DEPFILES= dialoged.d dlghndlr.d edlist.d edtree.d reseditr.d reswrite.d symbtabl.d winprop.d winstyle.d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)

diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in
index f35b44e651863117f989fe5c4205c22a27d47df5..38cef34494bc55bc59954d79976a50ba84faf039 100644 (file)
--- a/utils/hhp2cached/Makefile.in
+++ b/utils/hhp2cached/Makefile.in
@@ -9,7 +9,9 @@ PROGRAM=hhp2cached
 
 
 OBJECTS=$(PROGRAM).o
 
 
 OBJECTS=$(PROGRAM).o

+DEPFILES=$(PROGRAM).d

 
 include ../../src/makeprog.env
 
 
 include ../../src/makeprog.env
 

+-include $(DEPFILES)

 
 

diff --git a/utils/makegen/Makefile.in b/utils/makegen/Makefile.in
index 7b279b8a66f8d94eeaca96bca3b83982b6ab4b37..ba91161cba8e4191db15a0981b6232711f0e5a94 100644 (file)
--- a/utils/makegen/Makefile.in
+++ b/utils/makegen/Makefile.in
@@ -16,7 +16,9 @@ DATAFILES = templates/Makefile.in templates/makefile.b32 \
             templates/makefile.wat
 
 OBJECTS=$(PROGRAM).o
             templates/makefile.wat
 
 OBJECTS=$(PROGRAM).o

+DEPFILES=$(PROGRAM).d

 
 include ../../src/makeprog.env
 
 
 include ../../src/makeprog.env
 

+-include $(DEPFILES)

 
 

diff --git a/utils/makegen/templates/Makefile.in b/utils/makegen/templates/Makefile.in
index 8983b1bdc5096d52eb6b8aa5a650c5295cb8b287..248fd4f13ba2271ec044698eee1eb2bee6256e56 100644 (file)
--- a/utils/makegen/templates/Makefile.in
+++ b/utils/makegen/templates/Makefile.in
@@ -8,6 +8,8 @@ program_dir = samples/#NAME
 PROGRAM=#NAME
 
 OBJECTS=$(PROGRAM).o
 PROGRAM=#NAME
 
 OBJECTS=$(PROGRAM).o

+DEPFILES=$(PROGRAM).d

 
 include ../../src/makeprog.env
 
 
 include ../../src/makeprog.env
 

+-include $DEPFILES)

diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in
index 075c80ce30946308bbbcf75432c9a75290995786..d9d0de54059f9a32941b2674f492bd00b3634bb6 100644 (file)
--- a/utils/tex2rtf/src/Makefile.in
+++ b/utils/tex2rtf/src/Makefile.in
@@ -19,6 +19,8 @@ program_dir = utils/tex2rtf/src
 PROGRAM=tex2rtf
 
 OBJECTS = tex2rtf.o tex2any.o texutils.o rtfutils.o xlputils.o htmlutil.o readshg.o table.o
 PROGRAM=tex2rtf
 
 OBJECTS = tex2rtf.o tex2any.o texutils.o rtfutils.o xlputils.o htmlutil.o readshg.o table.o

+DEPFILES=tex2rtf.d tex2any.d texutils.d rtfutils.d xlputils.d htmlutil.d readshg.d table.d

 
 include ../../../src/makeprog.env
 
 
 include ../../../src/makeprog.env
 

+-include $(DEPFILES)