From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 8 Apr 2002 17:15:58 +0000 (+0000)
Subject: More BC++ makefile tweaks
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4d50d6840ad5eabc1d2267df1c3a8adaa93cdf58

More BC++ makefile tweaks


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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 0a1966f6d5..d62f9d553c 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -176,8 +176,8 @@ makearchsetuph:
      cd $(WXDIR)\src\msw
 
 $(ARCHINCDIR)\wx:
-    mkdir $(ARCHINCDIR)
-    mkdir $(ARCHINCDIR)\wx
+    -mkdir $(ARCHINCDIR)
+    -mkdir $(ARCHINCDIR)\wx
 
 !if "$(DLL)" == "0"
 
diff --git a/samples/makefile.b32 b/samples/makefile.b32
index b73df109e5..7c4613cc8f 100644
--- a/samples/makefile.b32
+++ b/samples/makefile.b32
@@ -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
@@ -187,6 +187,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
@@ -237,10 +239,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
@@ -297,10 +297,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
@@ -315,7 +313,6 @@ clean:
         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
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 56a8908a2d..39a5b243fe 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -216,10 +216,8 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\mdi
         nmake -f makefile.vc clean
-!if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.vc clean
-!endif
         cd $(WXDIR)\samples\mfc
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\menu
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 9600c9fb5e..9f095d03b1 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -397,8 +397,8 @@ makearchsetuph:
      cd $(WXDIR)\src\msw
 
 $(ARCHINCDIR)\wx:
-    mkdir $(ARCHINCDIR)
-    mkdir $(ARCHINCDIR)\wx
+    -mkdir $(ARCHINCDIR)
+    -mkdir $(ARCHINCDIR)\wx
 
 !if "$(DLL)" == "0"