A few tweaks

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

diff --git a/utils/wxPython/src/makefile.nt b/utils/wxPython/src/makefile.nt
index 4929e3e9b8a21ea75fdf57f303f8b0b8b7990279..f96d3a568378589c6ee638220ebbbca3e17639fb 100644 (file)
--- a/utils/wxPython/src/makefile.nt
+++ b/utils/wxPython/src/makefile.nt
@@ -146,11 +146,9 @@ clean:
 # Implicit rules to run SWIG
 {}.i{$(GENCODEDIR)}.cpp:
        swig $(SWIGFLAGS) -c -o $@ $<
 # Implicit rules to run SWIG
 {}.i{$(GENCODEDIR)}.cpp:
        swig $(SWIGFLAGS) -c -o $@ $<

-       move $(@B).py $(GENCODEDIR)

 
 {}.i{$(GENCODEDIR)}.py:
        swig $(SWIGFLAGS) -c -o $@ $<
 
 {}.i{$(GENCODEDIR)}.py:
        swig $(SWIGFLAGS) -c -o $@ $<

-       move $(@B).py $(GENCODEDIR)

 
 
 {$(GENCODEDIR)}.py{$(TARGETDIR)}.py:
 
 
 {$(GENCODEDIR)}.py{$(TARGETDIR)}.py:


@@ -167,20 +165,20 @@ clean:
 
 # This one must leave out the -c flag so we define the whole rule
 $(GENCODEDIR)\wxp.cpp $(GENCODEDIR)\wxp.py : wxp.i my_typemaps.i _defs.i _extras.py
 
 # This one must leave out the -c flag so we define the whole rule
 $(GENCODEDIR)\wxp.cpp $(GENCODEDIR)\wxp.py : wxp.i my_typemaps.i _defs.i _extras.py

-        swig $(SWIGFLAGS) -o $(GENCODEDIR)\wxp.cpp wxp.i
-       move wxp.py $(GENCODEDIR)\wxp.py
+        swig $(SWIGFLAGS) -o $(GENCODEDIR)/wxp.cpp wxp.i

 
 
 
 

-# define some dependencies
-$(GENCODEDIR)\windows.cpp   $(GENCODEDIR)\windows.py   : windows.i    my_typemaps.i _defs.i
-$(GENCODEDIR)\windows2.cpp  $(GENCODEDIR)\windows2.py  : windows2.i   my_typemaps.i _defs.i
-$(GENCODEDIR)\events.cpp    $(GENCODEDIR)\events.py    : events.i     my_typemaps.i _defs.i
-$(GENCODEDIR)\misc.cpp      $(GENCODEDIR)\misc.py      : misc.i       my_typemaps.i _defs.i
-$(GENCODEDIR)\gdi.cpp       $(GENCODEDIR)\gdi.py       : gdi.i        my_typemaps.i _defs.i
-$(GENCODEDIR)\mdi.cpp       $(GENCODEDIR)\mdi.py       : mdi.i        my_typemaps.i _defs.i
-$(GENCODEDIR)\controls.cpp  $(GENCODEDIR)\controls.py  : controls.i   my_typemaps.i _defs.i
-$(GENCODEDIR)\controls2.cpp $(GENCODEDIR)\controls2.py : controls2.i  my_typemaps.i _defs.i
-$(GENCODEDIR)\cmndlgs.cpp   $(GENCODEDIR)\cmndlgs.py   : cmndlgs.i    my_typemaps.i _defs.i
+# Define some dependencies.  These MUST use forward slashes so SWIG
+# will write the shadow file to the right directory.
+$(GENCODEDIR)/windows.cpp   $(GENCODEDIR)/windows.py   : windows.i    my_typemaps.i _defs.i
+$(GENCODEDIR)/windows2.cpp  $(GENCODEDIR)/windows2.py  : windows2.i   my_typemaps.i _defs.i
+$(GENCODEDIR)/events.cpp    $(GENCODEDIR)/events.py    : events.i     my_typemaps.i _defs.i
+$(GENCODEDIR)/misc.cpp      $(GENCODEDIR)/misc.py      : misc.i       my_typemaps.i _defs.i
+$(GENCODEDIR)/gdi.cpp       $(GENCODEDIR)/gdi.py       : gdi.i        my_typemaps.i _defs.i
+$(GENCODEDIR)/mdi.cpp       $(GENCODEDIR)/mdi.py       : mdi.i        my_typemaps.i _defs.i
+$(GENCODEDIR)/controls.cpp  $(GENCODEDIR)/controls.py  : controls.i   my_typemaps.i _defs.i
+$(GENCODEDIR)/controls2.cpp $(GENCODEDIR)/controls2.py : controls2.i  my_typemaps.i _defs.i
+$(GENCODEDIR)/cmndlgs.cpp   $(GENCODEDIR)/cmndlgs.py   : cmndlgs.i    my_typemaps.i _defs.i

 
 
 $(TARGETDIR)\wxp.py       : $(GENCODEDIR)\wxp.py
 
 
 $(TARGETDIR)\wxp.py       : $(GENCODEDIR)\wxp.py


@@ -199,7 +197,11 @@ $(TARGETDIR)\__init__.py  : __init__.py
 #------------------------------------------------------------------------
 #
 # $Log$
 #------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.5  1998/08/19 00:38:23  RD
+# A few tweaks
+#

 # Revision 1.4  1998/08/18 21:55:10  RD
 # Revision 1.4  1998/08/18 21:55:10  RD

+#

 # New build directory structure
 #
 # Revision 1.3  1998/08/15 07:36:37  RD
 # New build directory structure
 #
 # Revision 1.3  1998/08/15 07:36:37  RD