Removed some unnecessary bitmaps; other minor changes

[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 499a3e802953e07876cc8134cb86171f99a8cf67..273d32820fbfc001338bff6d6b7ef6cdbb93f8ff 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
 
 # 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
 # === 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
 # redirects to wxInstall below...
 
 install:       wxInstall


@@ -236,11 +246,11 @@ config.o: config.c
 
 # Setup is copied from Setup.in *only* if it doesn't yet exist
 Setup:
 
 # Setup is copied from Setup.in *only* if it doesn't yet exist
 Setup:

-               cp $(srcdir)/Setup.in Setup
+               cp Setup.in Setup

 
 # Make the intermediate Makefile.pre from Makefile.pre.in
 Makefile.pre: Makefile.pre.in sedscript
 
 # Make the intermediate Makefile.pre from Makefile.pre.in
 Makefile.pre: Makefile.pre.in sedscript

-               sed -f sedscript $(srcdir)/Makefile.pre.in >Makefile.pre
+               sed -f sedscript Makefile.pre.in >Makefile.pre

 
 # Shortcuts to make the sed arguments on one line
 P=prefix
 
 # Shortcuts to make the sed arguments on one line
 P=prefix


@@ -286,7 +296,7 @@ boot:       clobber
        VERSION=`$(PYTHON) -c "import sys; print sys.version[:3]"`; \
        installdir=`$(PYTHON) -c "import sys; print sys.prefix"`; \
        exec_installdir=`$(PYTHON) -c "import sys; print sys.exec_prefix"`; \
        VERSION=`$(PYTHON) -c "import sys; print sys.version[:3]"`; \
        installdir=`$(PYTHON) -c "import sys; print sys.prefix"`; \
        exec_installdir=`$(PYTHON) -c "import sys; print sys.exec_prefix"`; \

-       $(MAKE) -f $(srcdir)/Makefile.pre.in VPATH=$(VPATH) srcdir=$(srcdir) \
+       $(MAKE) -f Makefile.pre.in VPATH=$(VPATH) srcdir=$(srcdir) \

                VERSION=$$VERSION \
                installdir=$$installdir \
                exec_installdir=$$exec_installdir \
                VERSION=$$VERSION \
                installdir=$$installdir \
                exec_installdir=$$exec_installdir \


@@ -314,6 +324,7 @@ distclean:  clobber
 # Custom rules and dependencies added for wxPython
 #
 
 # Custom rules and dependencies added for wxPython
 #
 

+

 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__
 
 
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__
 
 


@@ -322,23 +333,22 @@ PYMODULES = $(GENCODEDIR)/wxp.py       $(GENCODEDIR)/events.py    \
            $(GENCODEDIR)/gdi.py       $(GENCODEDIR)/mdi.py       \
            $(GENCODEDIR)/controls.py  $(GENCODEDIR)/controls2.py \
             $(GENCODEDIR)/windows2.py  $(GENCODEDIR)/cmndlgs.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
 
 
 # Implicit rules to run SWIG
 $(GENCODEDIR)/%.cpp : %.i
        swig $(SWIGFLAGS) -c -o $@ $<
            __init__.py
 
 
 # Implicit rules to run SWIG
 $(GENCODEDIR)/%.cpp : %.i
        swig $(SWIGFLAGS) -c -o $@ $<

-       move $*.py $(GENCODEDIR)

 
 $(GENCODEDIR)/%.py : %.i
        swig $(SWIGFLAGS) -c -o $@ $<
 
 $(GENCODEDIR)/%.py : %.i
        swig $(SWIGFLAGS) -c -o $@ $<

-       move $*.py $(GENCODEDIR)

 
 
 # This one must leave out the -c flag so we define the whole rule
 
 
 # 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)
+$(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
 
 
 # define some dependencies


@@ -351,19 +361,28 @@ $(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)/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 $@

 
 
 wxInstall :    sharedmods $(PYMODULES)
        if test ! -d $(TARGETDIR) ; then \
                mkdir $(TARGETDIR) ; else true ; fi
 
 
 wxInstall :    sharedmods $(PYMODULES)
        if test ! -d $(TARGETDIR) ; then \
                mkdir $(TARGETDIR) ; else true ; fi

-       -for i in $(SHAREDMODS); do \
-               $(INSTALL_SHARED) $$i $(TARGETDIR)/$$i; \
-       done
+       if [ "$(SHAREDMODS)" != "" ]; then \
+               -chmod 755 $(SHAREDMODS); \
+                cp $(SHAREDMODS) $(TARGETDIR); fi

        -for i in $(PYMODULES); do \
        -for i in $(PYMODULES); do \

-               $(INSTALL) $$i $(TARGETDIR)/$$i; \
+               cp $$i $(TARGETDIR); \

        done
        python $(LIBDEST)/compileall.py -l $(TARGETDIR)
        python -O $(LIBDEST)/compileall.py -l $(TARGETDIR)
 
 
        done
        python $(LIBDEST)/compileall.py -l $(TARGETDIR)
        python -O $(LIBDEST)/compileall.py -l $(TARGETDIR)
 
 

+lib : libwxPython.a
+
+libwxPython.a : lib.a
+       cp $< $@