Updated versions to 2.3.3

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3f2f819f1d1783a79149a6bcb81d571fbecf68ee..395dd25cb420ab66ea05decf18c91d3ea3e6c0cb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,13 +17,13 @@ include ./src/make.env
 ############## override make.env for PIC ##########################
 
 %.o : %.c
 ############## override make.env for PIC ##########################
 
 %.o : %.c

-       $(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<

 
 %.o : %.cpp
 
 %.o : %.cpp

-       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<

 
 %.o : %.cxx
 
 %.o : %.cxx

-       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<

 
 %.r : %.rsrc
        $(DEREZ) $^ Carbon.r -useDF > $@
 
 %.r : %.rsrc
        $(DEREZ) $^ Carbon.r -useDF > $@


@@ -114,6 +114,7 @@ INTLDIR  = $(WXDIR)/locale
 ########################## Archive name ###############################
 
 # append a version suffix x.y.z to all file names
 ########################## Archive name ###############################
 
 # append a version suffix x.y.z to all file names

+VER_MAJMIN=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)

 VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
 WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
 WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
 VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
 WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
 WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz


@@ -315,11 +316,13 @@ all: @WX_ALL@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)

+       @$(RM) $@

        $(AR) $(AROPTIONS) $@ $(OBJECTS)
        $(RANLIB) $@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
        @$(INSTALL) -d $(build_libdir)
        $(AR) $(AROPTIONS) $@ $(OBJECTS)
        $(RANLIB) $@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
        @$(INSTALL) -d $(build_libdir)

+       @$(RM) $@

        $(AR) $(AROPTIONS) $@ glcanvas.o
        $(RANLIB) $@
 
        $(AR) $(AROPTIONS) $@ glcanvas.o
        $(RANLIB) $@
 


@@ -392,10 +395,15 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
 afminstall: preinstall
        @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
        $(INSTALL) -d $(datadir)/wx
 afminstall: preinstall
        @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
        $(INSTALL) -d $(datadir)/wx

-       $(INSTALL) -d $(datadir)/wx/afm
-       $(INSTALL) -d $(datadir)/wx/gs_afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+        
+m4datainstall: preinstall
+       $(INSTALL) -d $(datadir)/aclocal
+       $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal

 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory


@@ -410,7 +418,9 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
        cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
        cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config

-       $(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+       @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+       @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
+               $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi

 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include


@@ -424,6 +434,11 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
        @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
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
        @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
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi

+       @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
+
+       @# always install msw headers for wxBase, it's much simpler
+       @if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi
+

        $(INSTALL) -d $(includedir)/wx/protocol
        $(INSTALL) -d $(includedir)/wx/unix
        @list='$(HEADERS)'; for p in $$list; do \
        $(INSTALL) -d $(includedir)/wx/protocol
        $(INSTALL) -d $(includedir)/wx/unix
        @list='$(HEADERS)'; for p in $$list; do \


@@ -451,9 +466,9 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
        @echo " Installing wxWindows OpenGl add-on..."
        @echo " "
        @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
        @echo " Installing wxWindows OpenGl add-on..."
        @echo " "
        @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi

-       $(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+       @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@

 
 

-install: @AFMINSTALL@ @WX_ALL_INSTALLED@
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall

        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux) you'll now have to run ldconfig"


@@ -518,8 +533,8 @@ uninstall:
 ALL_DIST: distclean
        mkdir _dist_dir
        mkdir $(DISTDIR)
 ALL_DIST: distclean
        mkdir _dist_dir
        mkdir $(DISTDIR)

-       cp $(WXDIR)/configure.in $(DISTDIR)
-       cp $(WXDIR)/configure $(DISTDIR)
+       cp $(WXDIR)/wxwin.m4 $(DISTDIR)
+       cp $(WXDIR)/aclocal.m4 $(DISTDIR)

        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/config.guess $(DISTDIR)
        cp $(WXDIR)/install-sh $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/config.guess $(DISTDIR)
        cp $(WXDIR)/install-sh $(DISTDIR)


@@ -529,21 +544,24 @@ ALL_DIST: distclean
        cp $(WXDIR)/setup.h_vms $(DISTDIR)
        cp $(WXDIR)/descrip.mms $(DISTDIR)
        cp $(WXDIR)/Makefile.in $(DISTDIR)
        cp $(WXDIR)/setup.h_vms $(DISTDIR)
        cp $(WXDIR)/descrip.mms $(DISTDIR)
        cp $(WXDIR)/Makefile.in $(DISTDIR)

+       cp $(WXDIR)/wxBase.spec $(DISTDIR)

        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt

+       cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt

        mkdir $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
        mkdir $(DISTDIR)/src
        mkdir $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
        mkdir $(DISTDIR)/src

+       cp $(SRCDIR)/files.lst $(DISTDIR)/src/

        mkdir $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
        mkdir $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib

-       cp $(ZLIBDIR)/*.mcp $(DISTDIR)/src/zlib

        cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
        mkdir $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
        cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
        mkdir $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex

+       cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex

        cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
        cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
        cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex


@@ -555,10 +573,13 @@ ALL_DIST: distclean
 # 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
 # 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)/wxBase.spec $(DISTDIR)
+       cp $(WXDIR)/configure.in $(DISTDIR)
+       cp $(WXDIR)/configure $(DISTDIR)
+       cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt

        cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt

-       cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
+       if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
+         cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
+       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt

        cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
        cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx


@@ -585,7 +606,6 @@ ALL_GUI_DIST: ALL_DIST
        mkdir $(DISTDIR)/src/tiff
        mkdir $(DISTDIR)/src/iodbc
        mkdir $(DISTDIR)/src/unix
        mkdir $(DISTDIR)/src/tiff
        mkdir $(DISTDIR)/src/iodbc
        mkdir $(DISTDIR)/src/unix

-       cp $(SRCDIR)/files.lst $(DISTDIR)/src/

        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common


@@ -603,15 +623,12 @@ ALL_GUI_DIST: ALL_DIST
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
        cp $(PNGDIR)/*.c $(DISTDIR)/src/png
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
        cp $(PNGDIR)/*.c $(DISTDIR)/src/png

-       cp $(PNGDIR)/*.mcp $(DISTDIR)/src/png

        cp $(PNGDIR)/README $(DISTDIR)/src/png
        cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
        cp $(PNGDIR)/README $(DISTDIR)/src/png
        cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg

-       cp $(JPEGDIR)/*.mcp $(DISTDIR)/src/jpeg

        cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
        cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
        cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
        cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
        cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
        cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff

-       cp $(TIFFDIR)/*.mcp $(DISTDIR)/src/tiff

        cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
        cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
        cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
        cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc


@@ -622,19 +639,25 @@ ALL_GUI_DIST: ALL_DIST
        cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 
 BASE_DIST: ALL_DIST
        cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 
 BASE_DIST: ALL_DIST

+       # make --disable-gui the default
+       sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
+               $(WXDIR)/configure.in > $(DISTDIR)/configure.in
+       sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
+               $(WXDIR)/configure > $(DISTDIR)/configure
+       chmod +x $(DISTDIR)/configure

        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
        mkdir $(DISTDIR)/include/wx/protocol
        mkdir $(DISTDIR)/include/wx/unix
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
        mkdir $(DISTDIR)/include/wx/protocol
        mkdir $(DISTDIR)/include/wx/unix

+       mkdir $(DISTDIR)/include/wx/msw

        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/unix
        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/unix

-       cp $(WXDIR)/wxBase.spec $(DISTDIR)
+       mkdir $(DISTDIR)/src/msw

        cp @PORT_FILES@ $(DISTDIR)
        cp @PORT_FILES@ $(DISTDIR)

-       cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
-       cp $(WXDIR)/wxBase*.dsp $(DISTDIR)
-       cp $(WXDIR)/wxBase*.dsw $(DISTDIR)
+       cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
+       cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)

        cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt

-       cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
+       cp $(DOCDIR)/install.txt $(DISTDIR)/README.txt

        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
        cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
        cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common


@@ -655,6 +678,7 @@ BASE_DIST: ALL_DIST
        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/Makefile.in $(DISTDIR)/samples/console
        cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
        cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console

+       cp $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console

        cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
 
 GTK_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
 
 GTK_DIST: ALL_GUI_DIST


@@ -670,10 +694,11 @@ GTK_DIST: ALL_GUI_DIST
        cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MOTIF_DIST: ALL_GUI_DIST
        cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MOTIF_DIST: ALL_GUI_DIST

-       cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
+       cp $(WXDIR)/wxMotif.spec $(DISTDIR)

        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
        cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
        cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif

+       cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif

        cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
        mkdir $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
        mkdir $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo


@@ -681,9 +706,8 @@ MOTIF_DIST: ALL_GUI_DIST
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
 MACX_DIST: ALL_GUI_DIST
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
 MACX_DIST: ALL_GUI_DIST

-       cp $(INCDIR)/wx/*.* $(DISTDIR)/include/wx
+       cp $(INCDIR)/*.* $(DISTDIR)/include

        cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
        cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac

-       cp $(SRCDIR)/*.mcp $(DISTDIR)/src

        cp $(MACDIR)/files.lst $(DISTDIR)/src/mac
        cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac
        cp $(MACDIR)/*.c $(DISTDIR)/src/mac
        cp $(MACDIR)/files.lst $(DISTDIR)/src/mac
        cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac
        cp $(MACDIR)/*.c $(DISTDIR)/src/mac


@@ -692,14 +716,6 @@ MACX_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/src/mac/morefile
        cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile
        cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile
        mkdir $(DISTDIR)/src/mac/morefile
        cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile
        cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile

-       mkdir $(DISTDIR)/src/mac/cdef
-       cp $(MACDIR)/cdef/*.h $(DISTDIR)/src/mac/cdef
-       cp $(MACDIR)/cdef/*.c $(DISTDIR)/src/mac/cdef
-       cp $(MACDIR)/cdef/*.mcp $(DISTDIR)/src/mac/cdef
-       mkdir $(DISTDIR)/src/mac/ldef
-       cp $(MACDIR)/ldef/*.h $(DISTDIR)/src/mac/ldef
-       cp $(MACDIR)/ldef/*.c $(DISTDIR)/src/mac/ldef
-       cp $(MACDIR)/ldef/*.mcp $(DISTDIR)/src/mac/cdef

        mkdir $(DISTDIR)/src/mac/macsock
        cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
 
        mkdir $(DISTDIR)/src/mac/macsock
        cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
 


@@ -742,8 +758,6 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/configure $(DISTDIR)/demos
        cp $(DEMODIR)/configure.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
        mkdir $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs


@@ -752,6 +766,8 @@ DEMOS_DIST: ALL_GUI_DIST
        cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 
        cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 

+       cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+

        mkdir $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
        mkdir $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty


@@ -794,7 +810,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples/calendar
        cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
        cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
        mkdir $(DISTDIR)/samples/calendar
        cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
        cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar

-       cp $(SAMPDIR)/calendar/*.mcp $(DISTDIR)/samples/calendar

        cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
 
        mkdir $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
 
        mkdir $(DISTDIR)/samples/caret


@@ -806,7 +821,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
        mkdir $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst

-       cp $(SAMPDIR)/checklst/*.mcp $(DISTDIR)/samples/checklst

        cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst


@@ -814,7 +828,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
        mkdir $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config

-       cp $(SAMPDIR)/config/*.mcp $(DISTDIR)/samples/config

        cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
 
        mkdir $(DISTDIR)/samples/console
        cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
 
        mkdir $(DISTDIR)/samples/console


@@ -826,7 +839,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls

-       cp $(SAMPDIR)/controls/*.mcp $(DISTDIR)/samples/controls

        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls


@@ -842,7 +854,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs

-       cp $(SAMPDIR)/dialogs/*.mcp $(DISTDIR)/samples/dialogs

        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs


@@ -1288,6 +1299,7 @@ MANUAL_DIST:
        mkdir $(DISTDIR)/docs/latex
        mkdir $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
        mkdir $(DISTDIR)/docs/latex
        mkdir $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx

+       cp $(DOCDIR)/latex/wx/*.inc $(DISTDIR)/docs/latex/wx

        cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx


@@ -1299,10 +1311,13 @@ MANUAL_DIST:
 PYTHON_DIST:
        mkdir $(DISTDIR)/wxPython
        mkdir $(DISTDIR)/wxPython/contrib
 PYTHON_DIST:
        mkdir $(DISTDIR)/wxPython
        mkdir $(DISTDIR)/wxPython/contrib

+       mkdir $(DISTDIR)/wxPython/contrib/dllwidget
+       mkdir $(DISTDIR)/wxPython/contrib/gizmos

        mkdir $(DISTDIR)/wxPython/contrib/glcanvas
        mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
        mkdir $(DISTDIR)/wxPython/contrib/ogl
        mkdir $(DISTDIR)/wxPython/contrib/stc
        mkdir $(DISTDIR)/wxPython/contrib/glcanvas
        mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
        mkdir $(DISTDIR)/wxPython/contrib/ogl
        mkdir $(DISTDIR)/wxPython/contrib/stc

+       mkdir $(DISTDIR)/wxPython/contrib/stc/gtk

        mkdir $(DISTDIR)/wxPython/contrib/xrc
        mkdir $(DISTDIR)/wxPython/demo
        mkdir $(DISTDIR)/wxPython/demo/bitmaps
        mkdir $(DISTDIR)/wxPython/contrib/xrc
        mkdir $(DISTDIR)/wxPython/demo
        mkdir $(DISTDIR)/wxPython/demo/bitmaps


@@ -1311,6 +1326,7 @@ PYTHON_DIST:
        mkdir $(DISTDIR)/wxPython/src/gtk
        mkdir $(DISTDIR)/wxPython/wxPython
        mkdir $(DISTDIR)/wxPython/wxPython/lib
        mkdir $(DISTDIR)/wxPython/src/gtk
        mkdir $(DISTDIR)/wxPython/wxPython
        mkdir $(DISTDIR)/wxPython/wxPython/lib

+       mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust

        mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
        mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
 
        mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
        mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
 


@@ -1318,10 +1334,13 @@ PYTHON_DIST:
        cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
        cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
        cp $(WXDIR)/wxPython/MANIFEST.in $(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/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
+       cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos

        -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/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/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk

        -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
        -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
        -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
        -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
        -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
        -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps


@@ -1330,6 +1349,7 @@ PYTHON_DIST:
        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/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/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust

        cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
        cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
 
        cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
        cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
 


@@ -1437,7 +1457,7 @@ cleanall: clean
 
 RPMTOP=_dist_dir/_rpm_top
 
 
 RPMTOP=_dist_dir/_rpm_top
 

-rpm: dist
+rpm: bzip-dist

        @echo "*** Building RPMs ***"
        -mkdir $(RPMTOP)
        -mkdir $(RPMTOP)/SOURCES
        @echo "*** Building RPMs ***"
        -mkdir $(RPMTOP)
        -mkdir $(RPMTOP)/SOURCES


@@ -1445,7 +1465,7 @@ rpm: dist
        -mkdir $(RPMTOP)/BUILD
        -mkdir $(RPMTOP)/RPMS
        -mkdir $(RPMTOP)/SRPMS
        -mkdir $(RPMTOP)/BUILD
        -mkdir $(RPMTOP)/RPMS
        -mkdir $(RPMTOP)/SRPMS

-       cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
+       cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES

        rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
        mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .
 
        rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
        mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .