Pass parameters ( UNICODE WXUSINGDLL FINAL ) to subdirectories' makefiles.

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

diff --git a/samples/makefile.g95 b/samples/makefile.g95
index 859fa719a86f87f3dc3d760a3f1df57bdf92d3bf..4dc0659cc438a76a67eb0c0262f673f87d0c15f9 100644 (file)
--- a/samples/makefile.g95
+++ b/samples/makefile.g95
@@ -16,85 +16,91 @@ WXDIR = ..
 
 THISDIR=$(WXDIR)/samples
 MAKEFILE=makefile.g95
+MAKEFLAGS=WXUSINGDLL=$(WXUSINGDLL) UNICODE=$(UNICODE)
+CMDLINE=-f $(MAKEFILE) $(MAKEFLAGS)
 
 # Mingw make may not have a shell to use, so can't use a loop here. Sigh.
 # Please add new sample directories alphabetically to make it easier to
 # keep track.
 
 all clean:
-       -$(MAKE) -C calendar -f $(MAKEFILE) $@
-       -$(MAKE) -C caret -f $(MAKEFILE) $@
-       -$(MAKE) -C checklst -f $(MAKEFILE) $@
-       -$(MAKE) -C config -f $(MAKEFILE) $@
-       -$(MAKE) -C controls -f $(MAKEFILE) $@
-       -$(MAKE) -C db -f $(MAKEFILE) $@
-       -$(MAKE) -C dialogs -f $(MAKEFILE) $@
-       -$(MAKE) -C dialup -f $(MAKEFILE) $@
-       -$(MAKE) -C dnd -f $(MAKEFILE) $@
-       -$(MAKE) -C docview -f $(MAKEFILE) $@
-       -$(MAKE) -C docvwmdi -f $(MAKEFILE) $@
-       -$(MAKE) -C dragimag -f $(MAKEFILE) $@
-       -$(MAKE) -C drawing -f $(MAKEFILE) $@
-       -$(MAKE) -C dynamic -f $(MAKEFILE) $@
-       -$(MAKE) -C exec -f $(MAKEFILE) $@
-       -$(MAKE) -C font -f $(MAKEFILE) $@
-       -$(MAKE) -C grid -f $(MAKEFILE) $@
-       -$(MAKE) -C help -f $(MAKEFILE) $@
-       -$(MAKE) -C html -f $(MAKEFILE) $@
-       -$(MAKE) -C image -f $(MAKEFILE) $@
-       -$(MAKE) -C internat -f $(MAKEFILE) $@
-       -$(MAKE) -C ipc -f $(MAKEFILE) $@
-       -$(MAKE) -C joytest -f $(MAKEFILE) $@
-       -$(MAKE) -C layout -f $(MAKEFILE) $@
-       -$(MAKE) -C listctrl -f $(MAKEFILE) $@
-       -$(MAKE) -C mdi -f $(MAKEFILE) $@
-       -$(MAKE) -C menu -f $(MAKEFILE) $@
-       -$(MAKE) -C minifram -f $(MAKEFILE) $@
-       -$(MAKE) -C minimal -f $(MAKEFILE) $@
-       -$(MAKE) -C nativdlg -f $(MAKEFILE) $@
-       -$(MAKE) -C newgrid -f $(MAKEFILE) $@
-       -$(MAKE) -C notebook -f $(MAKEFILE) $@
-       -$(MAKE) -C oleauto -f $(MAKEFILE) $@
-       -$(MAKE) -C ownerdrw -f $(MAKEFILE) $@
-       -$(MAKE) -C png -f $(MAKEFILE) $@
-       -$(MAKE) -C printing -f $(MAKEFILE) $@
-       -$(MAKE) -C proplist -f $(MAKEFILE) $@
-       -$(MAKE) -C propsize -f $(MAKEFILE) $@
-       -$(MAKE) -C regtest -f $(MAKEFILE) $@
-       -$(MAKE) -C resource -f $(MAKEFILE) $@
-       -$(MAKE) -C richedit -f $(MAKEFILE) $@
-       -$(MAKE) -C rotate -f $(MAKEFILE) $@
-       -$(MAKE) -C sashtest -f $(MAKEFILE) $@
-       -$(MAKE) -C scroll -f $(MAKEFILE) $@
-       -$(MAKE) -C scrollsub -f $(MAKEFILE) $@
-       -$(MAKE) -C sockets -f $(MAKEFILE) $@
-       -$(MAKE) -C splitter -f $(MAKEFILE) $@
-       -$(MAKE) -C statbar -f $(MAKEFILE) $@
-       -$(MAKE) -C tab -f $(MAKEFILE) $@
-       -$(MAKE) -C taskbar -f $(MAKEFILE) $@
-       -$(MAKE) -C text -f $(MAKEFILE) $@
-       -$(MAKE) -C thread -f $(MAKEFILE) $@
-       -$(MAKE) -C toolbar -f $(MAKEFILE) $@
-       -$(MAKE) -C treectrl -f $(MAKEFILE) $@
-       -$(MAKE) -C treelay -f $(MAKEFILE) $@
-       -$(MAKE) -C typetest -f $(MAKEFILE) $@
-       -$(MAKE) -C validate -f $(MAKEFILE) $@
-       -$(MAKE) -C wizard -f $(MAKEFILE) $@
+       -$(MAKE) -C calendar $(CMDLINE) $@
+       -$(MAKE) -C caret $(CMDLINE) $@
+       -$(MAKE) -C checklst $(CMDLINE) $@
+       -$(MAKE) -C config $(CMDLINE) $@
+       -$(MAKE) -C controls $(CMDLINE) $@
+       -$(MAKE) -C db $(CMDLINE) $@
+       -$(MAKE) -C dialogs $(CMDLINE) $@
+       -$(MAKE) -C dialup $(CMDLINE) $@
+       -$(MAKE) -C dnd $(CMDLINE) $@
+       -$(MAKE) -C docview $(CMDLINE) $@
+       -$(MAKE) -C docvwmdi $(CMDLINE) $@
+       -$(MAKE) -C dragimag $(CMDLINE) $@
+       -$(MAKE) -C drawing $(CMDLINE) $@
+       -$(MAKE) -C dynamic $(CMDLINE) $@
+       -$(MAKE) -C erase $(CMDLINE) $@
+       -$(MAKE) -C event $(CMDLINE) $@
+       -$(MAKE) -C exec $(CMDLINE) $@
+       -$(MAKE) -C font $(CMDLINE) $@
+       -$(MAKE) -C grid $(CMDLINE) $@
+       -$(MAKE) -C help $(CMDLINE) $@
+       -$(MAKE) -C html $(CMDLINE) $@
+       -$(MAKE) -C image $(CMDLINE) $@
+       -$(MAKE) -C internat $(CMDLINE) $@
+       -$(MAKE) -C ipc $(CMDLINE) $@
+       -$(MAKE) -C joytest $(CMDLINE) $@
+       -$(MAKE) -C layout $(CMDLINE) $@
+       -$(MAKE) -C listbox $(CMDLINE) $@
+       -$(MAKE) -C listctrl $(CMDLINE) $@
+       -$(MAKE) -C mdi $(CMDLINE) $@
+       -$(MAKE) -C menu $(CMDLINE) $@
+       -$(MAKE) -C minifram $(CMDLINE) $@
+       -$(MAKE) -C minimal $(CMDLINE) $@
+       -$(MAKE) -C nativdlg $(CMDLINE) $@
+       -$(MAKE) -C newgrid $(CMDLINE) $@
+       -$(MAKE) -C notebook $(CMDLINE) $@
+       -$(MAKE) -C oleauto $(CMDLINE) $@
+       -$(MAKE) -C ownerdrw $(CMDLINE) $@
+       -$(MAKE) -C png $(CMDLINE) $@
+       -$(MAKE) -C printing $(CMDLINE) $@
+       -$(MAKE) -C proplist $(CMDLINE) $@
+       -$(MAKE) -C propsize $(CMDLINE) $@
+       -$(MAKE) -C regtest $(CMDLINE) $@
+       -$(MAKE) -C resource $(CMDLINE) $@
+       -$(MAKE) -C richedit $(CMDLINE) $@
+       -$(MAKE) -C rotate $(CMDLINE) $@
+       -$(MAKE) -C sashtest $(CMDLINE) $@
+       -$(MAKE) -C scroll $(CMDLINE) $@
+       -$(MAKE) -C scrollsub $(CMDLINE) $@
+       -$(MAKE) -C sockets $(CMDLINE) $@
+       -$(MAKE) -C splitter $(CMDLINE) $@
+       -$(MAKE) -C statbar $(CMDLINE) $@
+       -$(MAKE) -C tab $(CMDLINE) $@
+       -$(MAKE) -C taskbar $(CMDLINE) $@
+       -$(MAKE) -C text $(CMDLINE) $@
+       -$(MAKE) -C thread $(CMDLINE) $@
+       -$(MAKE) -C toolbar $(CMDLINE) $@
+       -$(MAKE) -C treectrl $(CMDLINE) $@
+       -$(MAKE) -C treelay $(CMDLINE) $@
+       -$(MAKE) -C typetest $(CMDLINE) $@
+       -$(MAKE) -C validate $(CMDLINE) $@
+       -$(MAKE) -C widgets $(CMDLINE) $@
+       -$(MAKE) -C wizard $(CMDLINE) $@
 
 
 # Samples untested
 #
-#      -$(MAKE) -C opengl -f $(MAKEFILE) $@
+#      -$(MAKE) -C opengl $(CMDLINE) $@
 
 # Missing makefile, sample untested
 #
-#      -$(MAKE) -C console -f $(MAKEFILE) $@
+#      -$(MAKE) -C console $(CMDLINE) $@
 
 # MFC still not available for cygwin/mingw
 #
-#      -$(MAKE) -C mfc -f $(MAKEFILE) $@
+#      -$(MAKE) -C mfc $(CMDLINE) $@
 
 # Memcheck does not work under cygwin/mingw
 #
-#      -$(MAKE) -C memcheck -f $(MAKEFILE) $@
+#      -$(MAKE) -C memcheck $(CMDLINE) $@
 

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 999eccf234f4538f6a009d483a8febc7716a9067..aef0d99c4dc840aa53775f4b282bc25a801b3926 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -30,134 +30,136 @@ PNGSETUP=
 
 !include $(WXDIR)\src\makemsc.env
 
+MAKEFLAGS=FINAL=$(FINAL) UNICODE=$(UNICODE) WXUSINGDLL=$(WXUSINGDLL)
+
 #
 # Please keep samples list up-to-date, in alphabetical order
 #
 all:
         cd $(WXDIR)\samples\calendar
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\caret
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\checklst
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\config
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\controls
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\db
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\ipc
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\dialogs
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\dnd
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\docview
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\docvwmdi
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\drawing
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\dynamic
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\font
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\grid
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\newgrid
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\help
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
 !if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\html
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
         cd $(WXDIR)\samples\image
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\internat
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\joytest
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\layout
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\listctrl
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\mdi
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\menu
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\mfc
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
         cd $(WXDIR)\samples\minifram
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\minimal
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\nativdlg
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\dialup
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
         cd $(WXDIR)\samples\notebook
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\oleauto
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\ownerdrw
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\png
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\printing
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\proplist
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\regtest
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\resource
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\richedit
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
         cd $(WXDIR)\samples\rotate
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\sashtest
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\scroll
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\scrollsub
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\splitter
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\tab
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
         cd $(WXDIR)\samples\taskbar
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\text
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\thread
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\toolbar
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\treectrl
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\typetest
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\validate
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\wizard
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\sockets
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 
 clean:
         cd $(WXDIR)\samples\calendar