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 0a1966f6d51086e95c037884b0ea853c25b169c5..d62f9d553c915eb9b11d08248c60895ca450691f 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -176,8 +176,8 @@ makearchsetuph:
      cd $(WXDIR)\src\msw
 
 $(ARCHINCDIR)\wx:
      cd $(WXDIR)\src\msw
 
 $(ARCHINCDIR)\wx:

-    mkdir $(ARCHINCDIR)
-    mkdir $(ARCHINCDIR)\wx
+    -mkdir $(ARCHINCDIR)
+    -mkdir $(ARCHINCDIR)\wx

 
 !if "$(DLL)" == "0"
 
 
 !if "$(DLL)" == "0"
 

diff --git a/samples/makefile.b32 b/samples/makefile.b32
index b73df109e5a3681d735d6d2ae871491b3d1a82da..7c4613cc8f44d309a70035c38ff293e6f851211d 100644 (file)
--- 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=
 PNGSETUP=
 # Need wxUSE_ODBC; define this to compile db sample
 ODBCSETUP=

-
+WXUSINGDLL=0

 
 #
 # Please keep samples list up-to-date, in alphabetical order
 
 #
 # Please keep samples list up-to-date, in alphabetical order


@@ -187,6 +187,8 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 
 clean:
         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
         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
         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
         cd $(WXDIR)\samples\memcheck
         make -f makefile.b32 clean

-!endif

         cd $(WXDIR)\samples\mfc
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\menu
         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
         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
         cd $(WXDIR)\samples\wizard
         make -f makefile.b32 clean

-!endif

         cd $(WXDIR)\samples\dragimag
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\erase
         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
         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
         cd $(WXDIR)\samples\sockets
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\treelay

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 56a8908a2da29cbb29fe70f431ed33e0b7925082..39a5b243fe33eb930e050c3f6b353085e0f17859 100644 (file)
--- 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
         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
         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.vc clean

-!endif

         cd $(WXDIR)\samples\mfc
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\menu
         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 9600c9fb5e07de5a39aa0bc3992099eff38bcd1c..9f095d03b1b35db68ccfc8e116d69515caccf49a 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -397,8 +397,8 @@ makearchsetuph:
      cd $(WXDIR)\src\msw
 
 $(ARCHINCDIR)\wx:
      cd $(WXDIR)\src\msw
 
 $(ARCHINCDIR)\wx:

-    mkdir $(ARCHINCDIR)
-    mkdir $(ARCHINCDIR)\wx
+    -mkdir $(ARCHINCDIR)
+    -mkdir $(ARCHINCDIR)\wx

 
 !if "$(DLL)" == "0"
 
 
 !if "$(DLL)" == "0"