]> git.saurik.com Git - wxWidgets.git/commitdiff
Distribution things.
authorRobert Roebling <robert@roebling.de>
Mon, 7 Jun 1999 15:53:28 +0000 (15:53 +0000)
committerRobert Roebling <robert@roebling.de>
Mon, 7 Jun 1999 15:53:28 +0000 (15:53 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

.cvsignore
distrib/gtk/copy_src
utils/glcanvas/samples/cube/Makefile [new file with mode: 0644]
utils/glcanvas/samples/isosurf/Makefile [new file with mode: 0644]
utils/glcanvas/samples/penguin/Makefile [new file with mode: 0644]
utils/wxPython/src/Makefile.pre.in [new file with mode: 0644]

index 9308efe86ca8e09484a2ac64fcde50f723da5236..a2e01eabd27a0427920117c3daaa6cacde713720 100644 (file)
@@ -21,3 +21,5 @@ Release
 Debug
 ReleaseDLL
 DebugDLL
+robert
+
index 60d7dc35f4742a98eaf33023500370734334594c..3ab041c43ba7e81e64f48ac62e7152a8c96046c9 100755 (executable)
@@ -16,7 +16,9 @@ echo Base dir..
 cd ../..
 cp wxGTK.spec ~/wxgtk_dist/wxGTK
 cp Makefile.am ~/wxgtk_dist/wxGTK
-cp Makefile.in ~/wxgtk_dist/wxGTK
+cp acconfig.h ~/wxgtk_dist/wxGTK
+cp aclocal.m4 ~/wxgtk_dist/wxGTK
+cp configure.in ~/wxgtk_dist/wxGTK
 cp configure ~/wxgtk_dist/wxGTK
 cp config.sub ~/wxgtk_dist/wxGTK
 cp config.guess ~/wxgtk_dist/wxGTK
@@ -27,6 +29,8 @@ cp missing ~/wxgtk_dist/wxGTK
 cp mkinstalldirs ~/wxgtk_dist/wxGTK
 cp wx-config.in ~/wxgtk_dist/wxGTK
 cp setup.h.in ~/wxgtk_dist/wxGTK
+cp stamp-h.in ~/wxgtk_dist/wxGTK
+cp Makefile.in ~/wxgtk_dist/wxGTK
 
 echo Docs..
 
@@ -57,6 +61,7 @@ cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx
 mkdir ~/wxgtk_dist/wxGTK/include/wx/generic
 cd generic
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/generic
+cp *.xpm ~/wxgtk_dist/wxGTK/include/wx/generic
 cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/generic
 cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/generic
 cd ..
@@ -322,6 +327,16 @@ cp *.h ~/wxgtk_dist/wxGTK/samples/bombs
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/bombs
 cd ..
 
+echo Caret sample..
+
+cd caret
+mkdir ~/wxgtk_dist/wxGTK/samples/caret
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/caret
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/caret
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/caret
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/caret
+cd ..
+
 echo Checklst sample..
 
 cd checklst
@@ -756,6 +771,5 @@ cd distrib/gtk
 cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
 cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src
 
-cd ..
-
-# tar ch | gzip -f9 > wxGTK-2.1.0-b6.tgz
+cd ~/wxgtk_dist
+# tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b6.tgz
diff --git a/utils/glcanvas/samples/cube/Makefile b/utils/glcanvas/samples/cube/Makefile
new file mode 100644 (file)
index 0000000..6e852b2
--- /dev/null
@@ -0,0 +1,29 @@
+#
+# File:                Makefile
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# Makefile for OpenGl demo (GTK version)
+#
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
+#
+
+CC = g++
+
+cube: cube.o glcanvas.o
+       $(CC) -o cube \
+       cube.o glcanvas.o \
+       `wx-config --libs` -lMesaGL -lMesaGLU
+
+cube.o: cube.cpp
+       $(CC) `wx-config --cflags` -I../../gtk -c cube.cpp
+
+glcanvas.o: ../../gtk/glcanvas.cpp
+       $(CC) `wx-config --cflags` `gtk-config --cflags` -I../../gtk -c ../../gtk/glcanvas.cpp
+
+clean: 
+       rm -f *.o cube
diff --git a/utils/glcanvas/samples/isosurf/Makefile b/utils/glcanvas/samples/isosurf/Makefile
new file mode 100644 (file)
index 0000000..ca09666
--- /dev/null
@@ -0,0 +1,29 @@
+#
+# File:                Makefile
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# Makefile for OpenGl demo (GTK version)
+#
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
+#
+
+CC = g++
+
+isosurf: isosurf.o glcanvas.o
+       $(CC) -o isosurf \
+       isosurf.o glcanvas.o \
+       `wx-config --libs` -lMesaGL -lMesaGLU
+
+isosurf.o: isosurf.cpp
+       $(CC) `wx-config --cflags` -I../../gtk -c isosurf.cpp
+
+glcanvas.o: ../../gtk/glcanvas.cpp
+       $(CC) `wx-config --cflags` `gtk-config --cflags` -I../../gtk -c ../../gtk/glcanvas.cpp
+
+clean: 
+       rm -f *.o isosurf
diff --git a/utils/glcanvas/samples/penguin/Makefile b/utils/glcanvas/samples/penguin/Makefile
new file mode 100644 (file)
index 0000000..0401bb9
--- /dev/null
@@ -0,0 +1,36 @@
+#
+# File:                Makefile
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# Makefile for OpenGL demo (GTK version)
+#
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
+#
+
+CPP = g++
+CC = gcc
+
+Penguin: penguin.o trackball.o lw.o glcanvas.o
+       $(CPP) -o Penguin \
+       penguin.o trackball.o lw.o glcanvas.o \
+       `wx-config --libs` -lMesaGL -lMesaGLU
+
+penguin.o: penguin.cpp
+       $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp
+
+lw.o: lw.cpp
+       $(CPP) `wx-config --cflags` -I../../gtk -c lw.cpp
+
+trackball.o: trackball.c
+       $(CC) `wx-config --cflags` -I../../gtk -c trackball.c
+
+glcanvas.o: ../../gtk/glcanvas.cpp
+       $(CPP) `wx-config --cflags` `gtk-config --cflags` -I../../gtk -c ../../gtk/glcanvas.cpp
+
+clean: 
+       rm -f *.o Penguin
diff --git a/utils/wxPython/src/Makefile.pre.in b/utils/wxPython/src/Makefile.pre.in
new file mode 100644 (file)
index 0000000..7a08b85
--- /dev/null
@@ -0,0 +1,421 @@
+# Universal Unix Makefile for Python extensions
+# =============================================
+
+# Short Instructions
+# ------------------
+
+# 1. Build and install Python (1.5 or newer).
+# 2. "make -f Makefile.pre.in boot"
+# 3. "make"
+# You should now have a shared library.
+
+# Long Instructions
+# -----------------
+
+# Build *and install* the basic Python 1.5 distribution.  See the
+# Python README for instructions.  (This version of Makefile.pre.in
+# only withs with Python 1.5, alpha 3 or newer.)
+
+# Create a file Setup.in for your extension.  This file follows the
+# format of the Modules/Setup.in file; see the instructions there.
+# For a simple module called "spam" on file "spammodule.c", it can
+# contain a single line:
+#   spam spammodule.c
+# You can build as many modules as you want in the same directory --
+# just have a separate line for each of them in the Setup.in file.
+
+# If you want to build your extension as a shared library, insert a
+# line containing just the string
+#   *shared*
+# at the top of your Setup.in file.
+
+# Note that the build process copies Setup.in to Setup, and then works
+# with Setup.  It doesn't overwrite Setup when Setup.in is changed, so
+# while you're in the process of debugging your Setup.in file, you may
+# want to edit Setup instead, and copy it back to Setup.in later.
+# (All this is done so you can distribute your extension easily and
+# someone else can select the modules they actually want to build by
+# commenting out lines in the Setup file, without editing the
+# original.  Editing Setup is also used to specify nonstandard
+# locations for include or library files.)
+
+# Copy this file (Misc/Makefile.pre.in) to the directory containing
+# your extension.
+
+# Run "make -f Makefile.pre.in boot".  This creates Makefile
+# (producing Makefile.pre and sedscript as intermediate files) and
+# config.c, incorporating the values for sys.prefix, sys.exec_prefix
+# and sys.version from the installed Python binary.  For this to work,
+# the python binary must be on your path.  If this fails, try
+#   make -f Makefile.pre.in Makefile VERSION=1.5 installdir=<prefix>
+# where <prefix> is the prefix used to install Python for installdir
+# (and possibly similar for exec_installdir=<exec_prefix>).
+
+# Note: "make boot" implies "make clobber" -- it assumes that when you
+# bootstrap you may have changed platforms so it removes all previous
+# output files.
+
+# If you are building your extension as a shared library (your
+# Setup.in file starts with *shared*), run "make" or "make sharedmods"
+# to build the shared library files.  If you are building a statically
+# linked Python binary (the only solution of your platform doesn't
+# support shared libraries, and sometimes handy if you want to
+# distribute or install the resulting Python binary), run "make
+# python".
+
+# Note: Each time you edit Makefile.pre.in or Setup, you must run
+# "make Makefile" before running "make".
+
+# Hint: if you want to use VPATH, you can start in an empty
+# subdirectory and say (e.g.):
+#   make -f ../Makefile.pre.in boot srcdir=.. VPATH=..
+
+
+# === Bootstrap variables (edited through "make boot") ===
+
+# The prefix used by "make inclinstall libainstall" of core python
+installdir=    /usr/local
+
+# The exec_prefix used by the same
+exec_installdir=$(installdir)
+
+# Source directory and VPATH in case you want to use VPATH.
+# (You will have to edit these two lines yourself -- there is no
+# automatic support as the Makefile is not generated by
+# config.status.)
+srcdir=                .
+VPATH=         .
+
+# === Variables that you may want to customize (rarely) ===
+
+# (Static) build target
+TARGET=                python
+
+# Installed python binary (used only by boot target)
+PYTHON=                python
+
+# Add more -I and -D options here
+CFLAGS=                $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+
+# These two variables can be set in Setup to merge extensions.
+# See example[23].
+BASELIB=
+BASESETUP=
+
+# === Variables set by makesetup ===
+
+MODOBJS=       _MODOBJS_
+MODLIBS=       _MODLIBS_
+
+# === Definitions added by makesetup ===
+
+# === Variables from configure (through sedscript) ===
+
+VERSION=       @VERSION@
+CC=            @CC@
+LINKCC=                @LINKCC@
+SGI_ABI=       @SGI_ABI@
+OPT=           @OPT@
+LDFLAGS=       @LDFLAGS@
+LDLAST=                @LDLAST@
+DEFS=          @DEFS@
+LIBS=          @LIBS@
+LIBM=          @LIBM@
+LIBC=          @LIBC@
+RANLIB=                @RANLIB@
+MACHDEP=       @MACHDEP@
+SO=            @SO@
+LDSHARED=      @LDSHARED@
+CCSHARED=      @CCSHARED@
+LINKFORSHARED= @LINKFORSHARED@
+#@SET_CCC@
+
+# Install prefix for architecture-independent files
+prefix=                /usr/local
+
+# Install prefix for architecture-dependent files
+exec_prefix=   $(prefix)
+
+# === Fixed definitions ===
+
+# Shell used by make (some versions default to the login shell, which is bad)
+SHELL=         /bin/sh
+
+# Expanded directories
+BINDIR=                $(exec_installdir)/bin
+LIBDIR=                $(exec_prefix)/lib
+MANDIR=                $(installdir)/man
+INCLUDEDIR=    $(installdir)/include
+SCRIPTDIR=     $(prefix)/lib
+
+# Detailed destination directories
+BINLIBDEST=    $(LIBDIR)/python$(VERSION)
+LIBDEST=       $(SCRIPTDIR)/python$(VERSION)
+INCLUDEPY=     $(INCLUDEDIR)/python$(VERSION)
+EXECINCLUDEPY= $(exec_installdir)/include/python$(VERSION)
+LIBP=          $(exec_installdir)/lib/python$(VERSION)
+DESTSHARED=    $(BINLIBDEST)/site-packages
+
+LIBPL=         $(LIBP)/config
+
+PYTHONLIBS=    $(LIBPL)/libpython$(VERSION).a
+
+MAKESETUP=     $(LIBPL)/makesetup
+MAKEFILE=      $(LIBPL)/Makefile
+CONFIGC=       $(LIBPL)/config.c
+CONFIGCIN=     $(LIBPL)/config.c.in
+SETUP=         $(LIBPL)/Setup
+
+SYSLIBS=       $(LIBM) $(LIBC)
+
+ADDOBJS=       $(LIBPL)/python.o config.o
+
+# Portable install script (configure doesn't always guess right)
+INSTALL=       $(LIBPL)/install-sh -c
+# Shared libraries must be installed with executable mode on some systems;
+# rather than figuring out exactly which, we always give them executable mode.
+# 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
+default:       sharedmods
+
+# Build everything
+all:           static sharedmods
+
+# Build shared libraries from our extension modules
+sharedmods:    $(SHAREDMODS)
+
+# Build a static Python binary containing our extension modules
+static:                $(TARGET)
+$(TARGET):     $(ADDOBJS) lib.a $(PYTHONLIBS) Makefile $(BASELIB)
+               $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) \
+                $(ADDOBJS) lib.a $(PYTHONLIBS) \
+                $(LINKPATH) $(BASELIB) $(MODLIBS) $(LIBS) $(SYSLIBS) \
+                -o $(TARGET) $(LDLAST)
+
+#------------------------------------------------------------------------
+#------------------------------------------------------------------------
+# This is a default version of the install target for wxPython.  It just
+# redirects to wxInstall below...
+
+install:       wxInstall
+
+#install:      sharedmods
+#              if test ! -d $(DESTSHARED) ; then \
+#                      mkdir $(DESTSHARED) ; else true ; fi
+#              -for i in X $(SHAREDMODS); do \
+#                      if test $$i != X; \
+#                      then $(INSTALL_SHARED) $$i $(DESTSHARED)/$$i; \
+#                      fi; \
+#              done
+
+
+# Build the library containing our extension modules
+lib.a:         $(MODOBJS)
+               -rm -f lib.a
+               ar cr lib.a $(MODOBJS)
+               -$(RANLIB) lib.a
+
+# This runs makesetup *twice* to use the BASESETUP definition from Setup
+config.c Makefile:     Makefile.pre Setup $(BASESETUP) $(MAKESETUP)
+               $(MAKESETUP) \
+                -m Makefile.pre -c $(CONFIGCIN) Setup -n $(BASESETUP) $(SETUP)
+               $(MAKE) -f Makefile do-it-again
+
+# Internal target to run makesetup for the second time
+do-it-again:
+               $(MAKESETUP) \
+                -m Makefile.pre -c $(CONFIGCIN) Setup -n $(BASESETUP) $(SETUP)
+
+# Make config.o from the config.c created by makesetup
+config.o:      config.c
+               $(CC) $(CFLAGS) -c config.c
+
+# Setup is copied from Setup.in *only* if it doesn't yet exist
+Setup:
+               cp Setup.in Setup
+
+# Make the intermediate Makefile.pre from Makefile.pre.in
+Makefile.pre: Makefile.pre.in sedscript
+               sed -f sedscript Makefile.pre.in >Makefile.pre
+
+# Shortcuts to make the sed arguments on one line
+P=prefix
+E=exec_prefix
+H=Generated automatically from Makefile.pre.in by sedscript.
+L=LINKFORSHARED
+
+# Make the sed script used to create Makefile.pre from Makefile.pre.in
+sedscript:     $(MAKEFILE)
+       sed -n \
+        -e '1s/.*/1i\\/p' \
+        -e '2s%.*%# $H%p' \
+        -e '/^VERSION=/s/^VERSION=[    ]*\(.*\)/s%@VERSION[@]%\1%/p' \
+        -e '/^CC=/s/^CC=[      ]*\(.*\)/s%@CC[@]%\1%/p' \
+        -e '/^CCC=/s/^CCC=[    ]*\(.*\)/s%#@SET_CCC[@]%CCC=\1%/p' \
+        -e '/^LINKCC=/s/^LINKCC=[      ]*\(.*\)/s%@LINKCC[@]%\1%/p' \
+        -e '/^OPT=/s/^OPT=[    ]*\(.*\)/s%@OPT[@]%\1%/p' \
+        -e '/^LDFLAGS=/s/^LDFLAGS=[    ]*\(.*\)/s%@LDFLAGS[@]%\1%/p' \
+        -e '/^DEFS=/s/^DEFS=[  ]*\(.*\)/s%@DEFS[@]%\1%/p' \
+        -e '/^LIBS=/s/^LIBS=[  ]*\(.*\)/s%@LIBS[@]%\1%/p' \
+        -e '/^LIBM=/s/^LIBM=[  ]*\(.*\)/s%@LIBM[@]%\1%/p' \
+        -e '/^LIBC=/s/^LIBC=[  ]*\(.*\)/s%@LIBC[@]%\1%/p' \
+        -e '/^RANLIB=/s/^RANLIB=[      ]*\(.*\)/s%@RANLIB[@]%\1%/p' \
+        -e '/^MACHDEP=/s/^MACHDEP=[    ]*\(.*\)/s%@MACHDEP[@]%\1%/p' \
+        -e '/^SO=/s/^SO=[      ]*\(.*\)/s%@SO[@]%\1%/p' \
+        -e '/^LDSHARED=/s/^LDSHARED=[  ]*\(.*\)/s%@LDSHARED[@]%\1%/p' \
+        -e '/^CCSHARED=/s/^CCSHARED=[  ]*\(.*\)/s%@CCSHARED[@]%\1%/p' \
+        -e '/^$L=/s/^$L=[      ]*\(.*\)/s%@$L[@]%\1%/p' \
+        -e '/^$P=/s/^$P=\(.*\)/s%^$P=.*%$P=\1%/p' \
+        -e '/^$E=/s/^$E=\(.*\)/s%^$E=.*%$E=\1%/p' \
+        $(MAKEFILE) >sedscript
+       echo "/^#@SET_CCC@/d" >>sedscript
+       echo "/^installdir=/s%=.*%=     $(installdir)%" >>sedscript
+       echo "/^exec_installdir=/s%=.*%=$(exec_installdir)%" >>sedscript
+       echo "/^srcdir=/s%=.*%=         $(srcdir)%" >>sedscript
+       echo "/^VPATH=/s%=.*%=          $(VPATH)%" >>sedscript
+       echo "/^LINKPATH=/s%=.*%=       $(LINKPATH)%" >>sedscript
+       echo "/^BASELIB=/s%=.*%=        $(BASELIB)%" >>sedscript
+       echo "/^BASESETUP=/s%=.*%=      $(BASESETUP)%" >>sedscript
+
+# Bootstrap target
+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"`; \
+       $(MAKE) -f Makefile.pre.in VPATH=$(VPATH) srcdir=$(srcdir) \
+               VERSION=$$VERSION \
+               installdir=$$installdir \
+               exec_installdir=$$exec_installdir \
+               Makefile
+
+# Handy target to remove intermediate files and backups
+clean:
+               -rm -f *.o *~
+
+# Handy target to remove everything that is easily regenerated
+clobber:       clean
+               -rm -f *.a tags TAGS config.c Makefile.pre $(TARGET) sedscript
+               -rm -f *.so *.sl so_locations
+
+
+# Handy target to remove everything you don't want to distribute
+distclean:     clobber
+               -rm -f Makefile Setup
+
+
+
+
+#------------------------------------------------------------------------
+#------------------------------------------------------------------------
+# Custom rules and dependencies added for wxPython
+#
+
+WXP_VERSION=2.0b9
+
+SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__ $(SEPARATE)
+
+
+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  \
+           $(GENCODEDIR)/image.py     $(GENCODEDIR)/glcanvas.py  \
+           __init__.py
+
+
+# Implicit rules to run SWIG
+$(GENCODEDIR)/%.cpp : %.i
+       swig $(SWIGFLAGS) -c -o $@ $<
+
+$(GENCODEDIR)/%.py : %.i
+       swig $(SWIGFLAGS) -c -o $@ $<
+
+
+# This one must leave out the -c flag so we define the whole rule
+$(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
+$(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
+$(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)/image.cpp     $(GENCODEDIR)/image.py     : image.i      my_typemaps.i _defs.i
+$(GENCODEDIR)/utils.cpp     $(GENCODEDIR)/utils.py     : utils.i      my_typemaps.i _defs.i
+$(GENCODEDIR)/glcanvas.cpp  $(GENCODEDIR)/glcanvas.py  : glcanvas.i   my_typemaps.i _defs.i
+
+$(GENCODEDIR)/helpers.cpp:
+       ln -s `pwd`/helpers.cpp $@
+
+$(GENCODEDIR)/_glcanvas.cpp:
+       -cp $(WXWIN)/utils/glcanvas/$(GENCODEDIR)/glcanvas.cpp $@
+       -cp $(WXWIN)/utils/glcanvas/$(GENCODEDIR)/glcanvas.h ./glcanvas.h
+
+
+wxInstall :    sharedmods $(PYMODULES)
+       if test ! -d $(TARGETDIR) ; then \
+               mkdir $(TARGETDIR) ; else true ; fi
+       if [ "$(SHAREDMODS)" != "" ]; then \
+                chmod 755 $(SHAREDMODS); \
+                cp $(SHAREDMODS) $(TARGETDIR); fi
+       -for i in $(PYMODULES); do \
+               cp $$i $(TARGETDIR); \
+       done
+       if [ "$(TARGETDIR)" != ".." ]; then        \
+               mkdir $(TARGETDIR)/lib;            \
+               mkdir $(TARGETDIR)/demo;           \
+               cp ../lib/*.py $(TARGETDIR)/lib;   \
+               cp ../demo/*.py $(TARGETDIR)/demo; \
+               cp ../lib/*.txt $(TARGETDIR)/lib;  \
+               cp ../demo/*.txt $(TARGETDIR)/demo;\
+       fi
+       if [ "$(TARGETDIR)" != ".." ]; then      \
+               python $(LIBDEST)/compileall.py $(TARGETDIR);      \
+               python -O $(LIBDEST)/compileall.py $(TARGETDIR);   \
+       else                                                       \
+               python $(LIBDEST)/compileall.py -l $(TARGETDIR);   \
+               python -O $(LIBDEST)/compileall.py -l $(TARGETDIR);\
+       fi
+
+
+
+
+lib : libwxPython.a
+
+libwxPython.a : lib.a
+       cp $< $@
+
+dist: tgz rpm
+
+tgz:
+       cd ../..; wxPython/distrib/maketgz $(WXP_VERSION)
+
+rpm:
+       cd ../distrib; ./makerpm $(WXP_VERSION)
+