]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
Updated SWIG generated code for wxGTK version
[wxWidgets.git] / Makefile.in
index de2bac5eb1596020388ca96431348948fe8f9574..6408f04a2aa368301b425eeb7ae6f1e321c7bb02 100644 (file)
@@ -42,11 +42,31 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
+VP12 = @top_srcdir@/src/msw/ole
+
+FTVP01 = @top_srcdir@/src/freetype/unix
+FTVP02 = @top_srcdir@/src/freetype/autohint
+FTVP03 = @top_srcdir@/src/freetype/base
+FTVP04 = @top_srcdir@/src/freetype/cff
+FTVP05 = @top_srcdir@/src/freetype/cid
+FTVP06 = @top_srcdir@/src/freetype/macfond
+FTVP07 = @top_srcdir@/src/freetype/otlayout
+FTVP08 = @top_srcdir@/src/freetype/psnames
+FTVP09 = @top_srcdir@/src/freetype/raster1
+FTVP10 = @top_srcdir@/src/freetype/sfnt
+FTVP11 = @top_srcdir@/src/freetype/smooth
+FTVP12 = @top_srcdir@/src/freetype/truetype
+FTVP13 = @top_srcdir@/src/freetype/type1
+FTVP14 = @top_srcdir@/src/freetype/type1z
+FTVP15 = @top_srcdir@/src/freetype/winfonts
+
+VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -67,6 +87,8 @@ oldincludedir = /usr/include
 
 DESTDIR =
 
+localedir = $(datadir)/locale
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -116,25 +138,39 @@ GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
+MACDIR   = $(WXDIR)/src/mac
 ODBCDIR  = $(WXDIR)/src/iodbc
+FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
 MISCDIR  = $(WXDIR)/misc
 
-DOCDIR = $(WXDIR)/docs
+DOCDIR   = $(WXDIR)/docs
+INTLDIR  = $(WXDIR)/locale
 
 ########################## Archive name ###############################
 
-WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+# append a version suffix x.y.z to all file names
+VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
+WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
+WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
+
+WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2
+WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
+WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
+WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
+
 DISTDIR = ./_dist_dir/@DISTDIR@
 
+
 ############################## Files ##################################
 
+WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//p'`
+
 # this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
 # ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
 # .d and .h/.inl files for the current toolkit
@@ -183,6 +219,24 @@ PNGOBJS     = \
                pngget.o \
                pngset.o
 
+FREETYPEOBJS = \
+               ftsystem.o \
+               autohint.o \
+               ftbase.o \
+               ftdebug.o \
+               ftglyph.o \
+               ftinit.o \
+               ftmm.o \
+               cff.o \
+               type1cid.o \
+               psnames.o \
+               psmodule.o \
+               raster1.o \
+               sfnt.o \
+               smooth.o \
+               truetype.o \
+               type1z.o \
+               winfnt.o
 
 JPEGOBJS    = \
                jcomapi.o \
@@ -283,7 +337,15 @@ IODBCOBJS = \
                misc.o \
                prepare.o \
                result.o
-        
+
+OLEOBJS = \
+               automtn.o \
+               dataobj.o \
+               dropsrc.o \
+               droptgt.o \
+               oleutils.o \
+               uuid.o
+  
 ############################## Rules ##################################
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
@@ -304,11 +366,17 @@ all: @WX_ALL@
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
-       
+
 @WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
-       
+
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.r: ./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc
+       $(DEREZ) $^ $(DEREZFLAGS) > $@
+
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc: $(MACRESOURCES)
+       $(REZ) $(REZFLAGS) $^ -o $@
+
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
@@ -317,7 +385,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
                && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
                && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
                && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
-       
+
 CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
        @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
        @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
@@ -326,7 +394,7 @@ CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
                && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
                && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
                && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
-       
+
 CREATE_INSTALLED_LINKS: preinstall
        $(RM) $(libdir)/@WX_LIBRARY_LINK1@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2@
@@ -335,7 +403,7 @@ CREATE_INSTALLED_LINKS: preinstall
                && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
                && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
                && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
-       
+
 CREATE_INSTALLED_LINKS_GL: preinstall_gl
        $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
@@ -344,7 +412,7 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
                && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
                && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
                && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
-       
+
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
@@ -380,7 +448,7 @@ afminstall: preinstall
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_DIR@-config
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
@@ -389,16 +457,16 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_D
        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(libdir)
 
-       $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_DIR@-config $(bindir)/wx@TOOLKIT_DIR@-config
-       cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_DIR@-config wx-config
+       $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
+       cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include
        $(INSTALL) -d $(libdir)/wx/include/wx
-       $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-       $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-       
+       $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+       $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
+
        $(INSTALL) -d $(includedir)/wx
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
@@ -410,6 +478,14 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_D
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
 
+       $(INSTALL) -d $(localedir)
+       @for p in $(WX_LINGUAS); do \
+         $(INSTALL) -d $(localedir)/$$p; \
+         $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
+         $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
+         echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
+       done
+
 preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
        @echo " "
        @echo " Installing wxWindows OpenGl add-on..."
@@ -445,9 +521,9 @@ uninstall:
        @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
        @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
        @echo " Removing helper files..."
-       @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+       @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
        @$(RM) $(bindir)/wx-config
-       @$(RM) $(bindir)/wx@TOOLKIT_DIR@-config
+       @$(RM) $(bindir)/wx@TOOLKIT_NAME@-config
        @$(RM) $(datadir)/wx/afm/*
        @$(RM) $(datadir)/wx/gs_afm/*
 # FIXME: wxBase doesnt install these next 3 dirs.
@@ -458,8 +534,15 @@ uninstall:
        @list='$(HEADERS)'; for p in $$list; do \
          $(RM) $(includedir)/wx/$$p; \
        done
+       @echo " Removing i18n files..."
+       @-for p in $(WX_LINGUAS); do \
+         $(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
+         rmdir $(localedir)/$$p/LC_MESSAGES; \
+         rmdir $(localedir)/$$p; \
+       done
        @echo " Removing directories..."
-       @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
+       @-rmdir $(localedir)
+       @if test -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_NAME@; fi
        @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
        @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
@@ -494,11 +577,18 @@ ALL_DIST: distclean
        mkdir $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
+       mkdir $(DISTDIR)/src
+       mkdir $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
        cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+       cp $(WXDIR)/wxBase.spec $(DISTDIR)
        cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
@@ -518,7 +608,6 @@ ALL_GUI_DIST: ALL_DIST
        cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
        cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
        cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-       mkdir $(DISTDIR)/src
        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/generic
        mkdir $(DISTDIR)/src/html
@@ -527,7 +616,6 @@ ALL_GUI_DIST: ALL_DIST
        mkdir $(DISTDIR)/src/png
        mkdir $(DISTDIR)/src/jpeg
        mkdir $(DISTDIR)/src/tiff
-       mkdir $(DISTDIR)/src/zlib
        mkdir $(DISTDIR)/src/iodbc
        mkdir $(DISTDIR)/src/unix
        cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
@@ -549,10 +637,6 @@ ALL_GUI_DIST: ALL_DIST
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
        cp $(PNGDIR)/*.c $(DISTDIR)/src/png
        cp $(PNGDIR)/README $(DISTDIR)/src/png
-       cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
-       cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
-       cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
-       cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
        cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
@@ -572,18 +656,18 @@ BASE_DIST: ALL_DIST
        mkdir $(DISTDIR)/include/wx
        mkdir $(DISTDIR)/include/wx/protocol
        mkdir $(DISTDIR)/include/wx/unix
-       mkdir $(DISTDIR)/src
        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/unix
        cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
        cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
        cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
-       cp $(WXDIR)/wxBase.dsp $(DISTDIR)
-       cp $(DOCDIR)/install.txt $(DISTDIR)/INSTALL.txt
+       cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
        cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
-       cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt
        cp $(SRCDIR)/*.in $(DISTDIR)/src
+       cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
+       cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
+       cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common
        list='$(HEADERS)'; for p in $$list; do \
          cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \
        done
@@ -591,8 +675,18 @@ BASE_DIST: ALL_DIST
          cp $(WXDIR)/src/$$p $(DISTDIR)/src/$$p; \
        done
 
+       mkdir $(DISTDIR)/samples
+       cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
+       cp $(SAMPDIR)/configure $(DISTDIR)/samples
+       cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
+
+       mkdir $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
+
 GTK_DIST: ALL_GUI_DIST
-       cp $(WXDIR)/wxGTK.spec $(DISTDIR)
        cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
        cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
@@ -612,6 +706,9 @@ MOTIF_DIST: ALL_GUI_DIST
        cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
+MACX_DIST: ALL_GUI_DIST
+       echo "Apple Mac OS X specific distribution not complete"
+
 MSW_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxWINE.spec $(DISTDIR)
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -630,9 +727,9 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
        cp $(DEMODIR)/configure $(DISTDIR)/demos
        cp $(DEMODIR)/configure.in $(DISTDIR)/demos
-       
+
        cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-           
+    
        mkdir $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -640,7 +737,7 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
-       
+
        mkdir $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -648,7 +745,7 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
-       
+
        mkdir $(DISTDIR)/demos/life
        mkdir $(DISTDIR)/demos/life/bitmaps
        cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
@@ -657,8 +754,9 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
-       
+
        mkdir $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
@@ -667,12 +765,12 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
-    
+
        mkdir $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
-       
+
 SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
@@ -860,8 +958,10 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
        cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+       cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de
        cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
        cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
+       cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de
 
        mkdir $(DISTDIR)/samples/ipc
        cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
@@ -870,6 +970,13 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
        cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
 
+       mkdir $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/Makefile.in $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
+
        mkdir $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
@@ -959,11 +1066,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
        cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
 
-       mkdir $(DISTDIR)/samples/plot
-       cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
-       cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
-       cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
-
        mkdir $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
@@ -1137,6 +1239,12 @@ MISC_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/misc/gs_afm
        cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 
+INTL_DIST:
+       mkdir $(DISTDIR)/locale
+       cp $(INTLDIR)/Makefile $(DISTDIR)/locale
+       cp $(INTLDIR)/*.po $(DISTDIR)/locale
+       -cp $(INTLDIR)/*.mo $(DISTDIR)/locale
+
 MANUAL_DIST:
        mkdir $(DISTDIR)/docs
        mkdir $(DISTDIR)/docs/latex
@@ -1151,49 +1259,70 @@ MANUAL_DIST:
 # those files needed for the Debian source package.
 # see utils/wxPython/distrib for scripts to make a proper wxPython dist.
 PYTHON_DIST:
-       mkdir $(DISTDIR)/utils/wxPython
-       mkdir $(DISTDIR)/utils/wxPython/demo
-       mkdir $(DISTDIR)/utils/wxPython/demo/bitmaps
-       mkdir $(DISTDIR)/utils/wxPython/demo/data
-       mkdir $(DISTDIR)/utils/wxPython/distrib
-       mkdir $(DISTDIR)/utils/wxPython/lib
-       mkdir $(DISTDIR)/utils/wxPython/lib/editor
-       mkdir $(DISTDIR)/utils/wxPython/lib/sizers
-       mkdir $(DISTDIR)/utils/wxPython/modules
-       mkdir $(DISTDIR)/utils/wxPython/modules/html
-       mkdir $(DISTDIR)/utils/wxPython/modules/utils
-       mkdir $(DISTDIR)/utils/wxPython/modules/utils/gtk
-       mkdir $(DISTDIR)/utils/wxPython/src
-       mkdir $(DISTDIR)/utils/wxPython/src/gtk
-
-       cp $(UTILSDIR)/wxPython/*.txt $(DISTDIR)/utils/wxPython
-       -cp $(UTILSDIR)/wxPython/demo/* $(DISTDIR)/utils/wxPython/demo
-       -cp $(UTILSDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/utils/wxPython/demo/bitmaps
-       -cp $(UTILSDIR)/wxPython/demo/data/* $(DISTDIR)/utils/wxPython/demo/data
-       cp $(UTILSDIR)/wxPython/distrib/build.py $(DISTDIR)/utils/wxPython/distrib
-       cp $(UTILSDIR)/wxPython/lib/*.py $(DISTDIR)/utils/wxPython/lib
-       cp $(UTILSDIR)/wxPython/lib/editor/*.py $(DISTDIR)/utils/wxPython/lib/editor
-       cp $(UTILSDIR)/wxPython/lib/sizers/*.py $(DISTDIR)/utils/wxPython/lib/sizers
-       -cp $(UTILSDIR)/wxPython/modules/html/* $(DISTDIR)/utils/wxPython/modules/html
-       -cp $(UTILSDIR)/wxPython/modules/utils/* $(DISTDIR)/utils/wxPython/modules/utils
-       cp $(UTILSDIR)/wxPython/modules/utils/gtk/utils.* $(DISTDIR)/utils/wxPython/modules/utils/gtk
-       -cp $(UTILSDIR)/wxPython/src/* $(DISTDIR)/utils/wxPython/src
-       cp $(UTILSDIR)/wxPython/src/gtk/*.py $(DISTDIR)/utils/wxPython/src/gtk
-       cp $(UTILSDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/utils/wxPython/src/gtk
+       mkdir $(DISTDIR)/wxPython
+       mkdir $(DISTDIR)/wxPython/contrib
+       mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+       mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+       mkdir $(DISTDIR)/wxPython/contrib/ogl
+       mkdir $(DISTDIR)/wxPython/contrib/stc
+       mkdir $(DISTDIR)/wxPython/demo
+       mkdir $(DISTDIR)/wxPython/demo/bitmaps
+       mkdir $(DISTDIR)/wxPython/demo/data
+       mkdir $(DISTDIR)/wxPython/src
+       mkdir $(DISTDIR)/wxPython/src/gtk
+       mkdir $(DISTDIR)/wxPython/wxPython
+       mkdir $(DISTDIR)/wxPython/wxPython/lib
+       mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+       mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers
+
+       cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+       -cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
+       cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+       -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+       -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+       -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+       -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+       -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+       -cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
+       cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
+       cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
+       cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
+       cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
 
 distclean:
        $(RM) -r _dist_dir
 
 dist: @GUIDIST@
+       cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir; \
+       mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
+       tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
+       mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples-$(VER_SUFFIX); \
+       tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+       mv wxSamples-$(VER_SUFFIX) samples; \
+       mv demos wxDemos-$(VER_SUFFIX); \
+       tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
+       mv wxDemos-$(VER_SUFFIX) demos; \
+       fi
+
+bzip-dist: @GUIDIST@
+       cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
        @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-       cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+       cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
        @if test "$(USE_GUI)" = 1; then \
        cd $(DISTDIR); \
        mv samples wxSamples; \
-       tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
+       tar ch wxSamples | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
        mv wxSamples samples; \
        mv demos wxDemos; \
-       tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
+       tar ch wxDemos | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
        mv wxDemos demos; \
        fi
 
@@ -1213,6 +1342,7 @@ clean:
        $(RM) *.d
        $(RM) parser.c
        $(RM) lexer.c
-       $(RM) -r ./lib/*
+       $(RM) -r ./lib/wx/*
+       $(RM) ./lib/lib*
 
 cleanall: clean