X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0b3964149a61fee08b40bf9ab70191641a9002a..6c342f3ff14900bec9b15a263ec44245961acadb:/samples/makefile.b32

diff --git a/samples/makefile.b32 b/samples/makefile.b32
index 1ea9ea55d0..d699a75658 100644
--- a/samples/makefile.b32
+++ b/samples/makefile.b32
@@ -3,7 +3,7 @@
 # Author:	Julian Smart
 # Created:	1993
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:	
 #
 # "%W% %G%"
 #
@@ -29,7 +29,7 @@ COMPIL=1
 PNGSETUP=
 # Need wxUSE_ODBC; define this to compile db sample
 ODBCSETUP=
-
+WXUSINGDLL=0
 
 #
 # Please keep samples list up-to-date, in alphabetical order
@@ -69,8 +69,6 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\grid
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-        cd $(WXDIR)\samples\newgrid
-        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 
         cd $(WXDIR)\samples\help
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
@@ -79,6 +77,8 @@ all:
         cd $(WXDIR)\samples\html
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 !endif
+        cd $(WXDIR)\samples\keyboard
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\image
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\internat
@@ -121,16 +121,8 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\printing
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-        cd $(WXDIR)\samples\proplist
-        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\regtest
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-        cd $(WXDIR)\samples\resource
-        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-!if "$(COMPIL)"==""
-        cd $(WXDIR)\samples\richedit
-        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-!endif
         cd $(WXDIR)\samples\rotate
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\sashtest
@@ -165,8 +157,6 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\exec
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-        cd $(WXDIR)\samples\richedit
-        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\statbar
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\sockets
@@ -175,8 +165,6 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\tab
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-        cd $(WXDIR)\samples\treelay
-        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\erase
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\event
@@ -185,6 +173,8 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 
 clean:
+        cd $(WXDIR)\samples\artprov
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\calendar
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\caret
@@ -215,8 +205,6 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\grid
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\newgrid
-        make -f makefile.b32 clean
         cd $(WXDIR)\samples\help
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\html
@@ -225,6 +213,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\internat
         make -f makefile.b32 clean
+        cd $(WXDIR)\samples\keyboard
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\joytest
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\layout
@@ -233,10 +223,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\mdi
         make -f makefile.b32 clean
-!if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
         make -f makefile.b32 clean
-!endif
         cd $(WXDIR)\samples\mfc
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\menu
@@ -259,14 +247,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\printing
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\proplist
-        make -f makefile.b32 clean
         cd $(WXDIR)\samples\regtest
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\resource
-        make -f makefile.b32 clean
-        cd $(WXDIR)\samples\richedit
-        make -f makefile.b32 clean
         cd $(WXDIR)\samples\rotate
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\sashtest
@@ -293,10 +275,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\validate
         make -f makefile.b32 clean
-!if "$(NOMAKE)"==""
         cd $(WXDIR)\samples\wizard
         make -f makefile.b32 clean
-!endif
         cd $(WXDIR)\samples\dragimag
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\erase
@@ -307,15 +287,10 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\statbar
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\richedit
-        make -f makefile.b32 clean
         cd $(WXDIR)\samples\propsize
         make -f makefile.b32 clean
-
         cd $(WXDIR)\samples\sockets
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\treelay
-        make -f makefile.b32 clean
         cd $(WXDIR)\samples\treectrl
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\tab