Updated target list in Makefile

Corrected comment in base.t ( creates src/files.lst, not src/common/files.lst )
Added new files to filelist.txt.

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

diff --git a/distrib/msw/tmake/Makefile b/distrib/msw/tmake/Makefile
index c340ebe7086b46a9f6b7dc32085fc2be1f049183..5711fa40b8daa1ae86a3a44027186673bed1439b 100644 (file)
--- a/distrib/msw/tmake/Makefile
+++ b/distrib/msw/tmake/Makefile
@@ -15,11 +15,18 @@ all: $(MSW_MAKEFILES_DIR)/makefile.vc \
      $(MSW_MAKEFILES_DIR)/makefile.wat \
      $(MSW_MAKEFILES_DIR)/makefile.g95 \
      $(WXDIR)/Makefile.in \
      $(MSW_MAKEFILES_DIR)/makefile.wat \
      $(MSW_MAKEFILES_DIR)/makefile.g95 \
      $(WXDIR)/Makefile.in \

+     $(WXDIR)/src/files.lst \

      $(WXDIR)/src/msw/files.lst \
      $(WXDIR)/src/gtk/files.lst \
      $(WXDIR)/src/mac/files.lst \
      $(WXDIR)/src/motif/files.lst \
      $(WXDIR)/src/os2/files.lst \
      $(WXDIR)/src/msw/files.lst \
      $(WXDIR)/src/gtk/files.lst \
      $(WXDIR)/src/mac/files.lst \
      $(WXDIR)/src/motif/files.lst \
      $(WXDIR)/src/os2/files.lst \

+     $(WXDIR)/src/mgl/files.lst \
+     $(WXDIR)/src/microwin/files.lst \
+     $(WXDIR)/src/univ/files.lst \
+     $(WXDIR)/src/wxBase.dsp \
+     $(WXDIR)/src/wxWindows.dsp \
+     $(WXDIR)/src/wxUniv.dsp

 
 $(MSW_MAKEFILES_DIR)/makefile.vc: vc.t filelist.txt wxwin.pro
        $(TMAKE) -t vc wxwin.pro -o $@
 
 $(MSW_MAKEFILES_DIR)/makefile.vc: vc.t filelist.txt wxwin.pro
        $(TMAKE) -t vc wxwin.pro -o $@


@@ -42,13 +49,16 @@ $(MSW_MAKEFILES_DIR)/makefile.wat: wat.t filelist.txt wxwin.pro
 $(MSW_MAKEFILES_DIR)/makefile.g95: g95.t filelist.txt wxwin.pro
        $(TMAKE) -t g95 wxwin.pro -o $@
 
 $(MSW_MAKEFILES_DIR)/makefile.g95: g95.t filelist.txt wxwin.pro
        $(TMAKE) -t g95 wxwin.pro -o $@
 

+$(WXDIR)/src/files.lst: base.t filelist.txt wxwin.pro
+       $(TMAKE) -t base wxwin.pro -o $@
+

 $(WXDIR)/src/msw/files.lst: msw.t filelist.txt wxwin.pro
        $(TMAKE) -t msw wxwin.pro -o $@
 
 $(WXDIR)/src/msw/files.lst: msw.t filelist.txt wxwin.pro
        $(TMAKE) -t msw wxwin.pro -o $@
 

-$(WXDIR)/src/gtk/files.lst: mgl.t filelist.txt wxwin.pro
+$(WXDIR)/src/mgl/files.lst: mgl.t filelist.txt wxwin.pro

        $(TMAKE) -t mgl wxwin.pro -o $@
 
        $(TMAKE) -t mgl wxwin.pro -o $@
 

-$(WXDIR)/src/gtk/files.lst: micro.t filelist.txt wxwin.pro
+$(WXDIR)/src/microwin/files.lst: micro.t filelist.txt wxwin.pro

        $(TMAKE) -t micro wxwin.pro -o $@
 
 $(WXDIR)/src/gtk/files.lst: gtk.t filelist.txt wxwin.pro
        $(TMAKE) -t micro wxwin.pro -o $@
 
 $(WXDIR)/src/gtk/files.lst: gtk.t filelist.txt wxwin.pro


@@ -63,3 +73,14 @@ $(WXDIR)/src/motif/files.lst: motif.t filelist.txt wxwin.pro
 $(WXDIR)/src/os2/files.lst: os2.t filelist.txt wxwin.pro
        $(TMAKE) -t os2 wxwin.pro -o $@
 
 $(WXDIR)/src/os2/files.lst: os2.t filelist.txt wxwin.pro
        $(TMAKE) -t os2 wxwin.pro -o $@
 

+$(WXDIR)/src/univ/files.lst: univ.t filelist.txt wxwin.pro
+       $(TMAKE) -t univ wxwin.pro -o $@
+
+$(WXDIR)/src/wxBase.dsp: vc6base.t filelist.txt wxwin.pro
+       $(TMAKE) -t vc6base wxwin.pro -o $@
+
+$(WXDIR)/src/wxWindows.dsp: vc6msw.t filelist.txt wxwin.pro
+       $(TMAKE) -t vc6msw wxwin.pro -o $@
+
+$(WXDIR)/src/wxUniv.dsp: vc6univ.t filelist.txt wxwin.pro
+       $(TMAKE) -t vc6univ wxwin.pro -o $@

diff --git a/distrib/msw/tmake/base.t b/distrib/msw/tmake/base.t
index 889aa93d74716edbd92fe4010c4f90c73bada606..f3e9719275e0e912d16a40ae3fc1d177220409d0 100644 (file)
--- a/distrib/msw/tmake/base.t
+++ b/distrib/msw/tmake/base.t
@@ -1,6 +1,6 @@
 #!################################################################################
 #! File:    base.t
 #!################################################################################
 #! File:    base.t

-#! Purpose: tmake template file from which src/common/files.lst containing the
+#! Purpose: tmake template file from which src/files.lst containing the

 #!          list of files for wxBase library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 27.01.00
 #!          list of files for wxBase library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 27.01.00

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 1124d42d06e5b4b8c9da6869a99731a83cae756d..631c87d1db82d31ed2e358fc8651039b0a43af65 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -167,6 +167,7 @@ gdicmn.cpp  Common
 geometry.cpp   Common
 gifdecod.cpp   Common
 hash.cpp       Common  Base
 geometry.cpp   Common
 gifdecod.cpp   Common
 hash.cpp       Common  Base

+hashmap.cpp    Common  Base

 helpbase.cpp   Common
 http.cpp       Common  Socket,Base
 imagall.cpp    Common
 helpbase.cpp   Common
 http.cpp       Common  Socket,Base
 imagall.cpp    Common


@@ -793,6 +794,7 @@ glcanvas.h  WXH
 grid.h WXH
 gsocket.h      WXH     Base
 hash.h WXH     Base
 grid.h WXH
 gsocket.h      WXH     Base
 hash.h WXH     Base

+hashmap.h      WXH     Base

 help.h WXH
 helpbase.h     WXH
 helphtml.h     WXH
 help.h WXH
 helpbase.h     WXH
 helphtml.h     WXH