Added $(OVERRIDEFLAGS) to the end of the flags so default flags can be overridden.

[wxWidgets.git] / utils / wxPython / src / Makefile.pre.in

diff --git a/utils/wxPython/src/Makefile.pre.in b/utils/wxPython/src/Makefile.pre.in
index 03490bf91b1bcb3b6288a7530089d2acee3e52dd..293791062c9c2f047324c8176caa357a1f2926ba 100644 (file)
--- a/utils/wxPython/src/Makefile.pre.in
+++ b/utils/wxPython/src/Makefile.pre.in
@@ -328,11 +328,13 @@ distclean:        clobber
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__
 
 
-PYMODULES = $(GENCODEDIR)/wxp.py       $(GENCODEDIR)/events.py    \
+PYMODULES = $(GENCODEDIR)/wx.py        $(GENCODEDIR)/events.py    \
            $(GENCODEDIR)/windows.py   $(GENCODEDIR)/misc.py      \
            $(GENCODEDIR)/gdi.py       $(GENCODEDIR)/mdi.py       \
            $(GENCODEDIR)/controls.py  $(GENCODEDIR)/controls2.py \
             $(GENCODEDIR)/windows2.py  $(GENCODEDIR)/cmndlgs.py   \
+            $(GENCODEDIR)/frames.py    $(GENCODEDIR)/stattool.py   \
+           $(GENCODEDIR)/utils.py    \
            __init__.py
 
 
@@ -345,8 +347,8 @@ $(GENCODEDIR)/%.py : %.i
 
 
 # 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
+$(GENCODEDIR)/wx.cpp $(GENCODEDIR)/wx.py : wx.i my_typemaps.i _defs.i _extras.py
+       swig $(SWIGFLAGS) -o $(GENCODEDIR)/wx.cpp wx.i
 
 
 # define some dependencies
@@ -359,6 +361,9 @@ $(GENCODEDIR)/mdi.cpp       $(GENCODEDIR)/mdi.py       : mdi.i        my_typemap
 $(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
+$(GENCODEDIR)/frames.cpp    $(GENCODEDIR)/frames.py    : frames.i     my_typemaps.i _defs.i
+$(GENCODEDIR)/stattool.cpp  $(GENCODEDIR)/stattool.py  : stattool.i   my_typemaps.i _defs.i
+$(GENCODEDIR)/utils.cpp     $(GENCODEDIR)/utils.py     : utils.i      my_typemaps.i _defs.i
 
 $(GENCODEDIR)/helpers.cpp:
        ln -s `pwd`/helpers.cpp $@
@@ -367,8 +372,9 @@ $(GENCODEDIR)/helpers.cpp:
 wxInstall :    sharedmods $(PYMODULES)
        if test ! -d $(TARGETDIR) ; then \
                mkdir $(TARGETDIR) ; else true ; fi
-       -chmod 755 $(SHAREDMODS); \
-        cp $(SHAREDMODS) $(TARGETDIR);
+       if [ "$(SHAREDMODS)" != "" ]; then \
+               -chmod 755 $(SHAREDMODS); \
+                cp $(SHAREDMODS) $(TARGETDIR); fi
        -for i in $(PYMODULES); do \
                cp $$i $(TARGETDIR); \
        done
@@ -376,3 +382,7 @@ wxInstall : sharedmods $(PYMODULES)
        python -O $(LIBDEST)/compileall.py -l $(TARGETDIR)
 
 
+lib : libwxPython.a
+
+libwxPython.a : lib.a
+       cp $< $@