minimal now works in Unicode mode

[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 34da6f3eb052d25f722b00385fcf6fb4922e80da..22a18a2af9be220b208de2361b28baf70067c2a3 100644 (file)
--- a/utils/wxPython/src/Makefile.pre.in
+++ b/utils/wxPython/src/Makefile.pre.in
@@ -177,6 +177,16 @@ INSTALL=   $(LIBPL)/install-sh -c
 # Also, making them read-only seems to be a good idea...
 INSTALL_SHARED=        ${INSTALL} -m 555
 
+#---------------------------------------------------
+# Possibly change some definintions for C++
+ifdef MY_LDSHARED
+LDSHARED=$(MY_LDSHARED)
+endif
+ifdef MY_LINKCC
+LINKCC=$(MY_LINKCC)
+endif
+
+
 # === Fixed rules ===
 
 # Default target.  This builds shared libraries only
@@ -198,7 +208,7 @@ $(TARGET):  $(ADDOBJS) lib.a $(PYTHONLIBS) Makefile $(BASELIB)
 
 #------------------------------------------------------------------------
 #------------------------------------------------------------------------
-# This is a defaul version of the install target for wxPython.  It just
+# This is a default version of the install target for wxPython.  It just
 # redirects to wxInstall below...
 
 install:       wxInstall
@@ -314,18 +324,17 @@ distclean:        clobber
 # Custom rules and dependencies added for wxPython
 #
 
-ifdef MY_LDSHARED
-LDSHARED=$(MY_LDSHARED)
-endif
 
 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     $(GENCODEDIR)/windows3.py  \
            __init__.py
 
 
@@ -338,13 +347,14 @@ $(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
 $(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)/windows3.cpp  $(GENCODEDIR)/windows3.py  : windows3.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
@@ -352,6 +362,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 $@
@@ -360,8 +373,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
@@ -369,3 +383,7 @@ wxInstall : sharedmods $(PYMODULES)
        python -O $(LIBDEST)/compileall.py -l $(TARGETDIR)
 
 
+lib : libwxPython.a
+
+libwxPython.a : lib.a
+       cp $< $@