replaced my recent GSocket_SetReuseAddr() addition with GSocket_SetReusable() from...

[wxWidgets.git] / wxPython / distrib / msw / .makesetup.mk

diff --git a/wxPython/distrib/msw/.makesetup.mk b/wxPython/distrib/msw/.makesetup.mk
index 06a1130d335f32e51a1192c16c186222d7a16b60..369b10c1dd83a0a7dd9e34b167e31e584315546d 100644 (file)
--- a/wxPython/distrib/msw/.makesetup.mk
+++ b/wxPython/distrib/msw/.makesetup.mk
@@ -1,12 +1,14 @@
 
-SRC=$(WXWIN)\include\wx\msw\setup.h
-DIR=$(WXWIN)\lib
-FILES= $(DIR)\vc_dll\mswd\wx\setup.h \
-        $(DIR)\vc_dll\mswh\wx\setup.h \
-        $(DIR)\vc_dll\mswud\wx\setup.h \
-        $(DIR)\vc_dll\mswuh\wx\setup.h \
-        $(DIR)\vc_dll\msw\wx\setup.h \
-        $(DIR)\vc_dll\mswu\wx\setup.h \
+SRC=$(WXWIN)/include/wx/msw/setup.h
+DIR=$(WXWIN)/lib
+FILES= $(DIR)/vc_dll/mswd/wx/setup.h \
+        $(DIR)/vc_dll/mswh/wx/setup.h \
+        $(DIR)/vc_dll/mswud/wx/setup.h \
+        $(DIR)/vc_dll/mswuh/wx/setup.h \
+        $(DIR)/vc_dll/msw/wx/setup.h \
+        $(DIR)/vc_dll/mswu/wx/setup.h \
+       \
+        $(DIR)/vc_lib/msw/wx/setup.h \
 
 
 UNI_SEDCMD=sed "s!wxUSE_UNICODE 0!wxUSE_UNICODE 1!g;s!wxUSE_UNICODE_MSLU 0!wxUSE_UNICODE_MSLU 1!g"
@@ -14,37 +16,42 @@ HYB_SEDCMD=sed "s!wxUSE_MEMORY_TRACING 1!wxUSE_MEMORY_TRACING 0!g;s!wxUSE_DEBUG_
 
 all : $(FILES)
 
-
+test :
+       echo $(DIR)\vc_lib\msw\wx\setup.h
 
 # debug
 $(DIR)\vc_dll\mswd\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswd\wx mkdir /s $(DIR)\vc_dll\mswd\wx
-       cat $(SRC) > $@
+       cat $(SRC) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # hybrid
 $(DIR)\vc_dll\mswh\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswh\wx mkdir /s $(DIR)\vc_dll\mswh\wx
-       cat $(SRC) | $(HYB_SEDCMD) > $@
+       cat $(SRC) | $(HYB_SEDCMD) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # release
 $(DIR)\vc_dll\msw\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\msw\wx mkdir /s $(DIR)\vc_dll\msw\wx
-       cat $(SRC) > $@
+       cat $(SRC) > setup.h.tmp
+       mv setup.h.tmp $@
+
+$(DIR)\vc_lib\msw\wx\setup.h : $(SRC) .makesetup.mk
+       cat $(SRC) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # debug-uni
 $(DIR)\vc_dll\mswud\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswud\wx mkdir /s $(DIR)\vc_dll\mswud\wx
-       cat $(SRC) | $(UNI_SEDCMD) > $@
+       cat $(SRC) | $(UNI_SEDCMD) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # hybrid-uni
 $(DIR)\vc_dll\mswuh\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswuh\wx mkdir /s $(DIR)\vc_dll\mswuh\wx
-       cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > $@
+       cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # release-uni
 $(DIR)\vc_dll\mswu\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswu\wx mkdir /s $(DIR)\vc_dll\mswu\wx
-       cat $(SRC) | $(UNI_SEDCMD) > $@
+       cat $(SRC) | $(UNI_SEDCMD) > setup.h.tmp
+       mv setup.h.tmp $@