More build system polishing.. mostly. Some stuff ported over from

recent changes to the 2.2 branch.

Rationalised the autoconf scripts again, removed lots of stuff that
shouldn't be there anymore and pounded the rest into an even tighter
furball. (There's more work to be done here, but we're getting there..)

Implemented the library naming scheme outlined in tn0012.txt -- introduced
'toolchain' and 'widget set' into the autoconf scripts, obsoleted the
top level wx/setup.h and much of the mess associated with it.

More changes for cross compiling and 2.3 debs.

s/burnt_name/soname/g ; s/CC/CXX/g ; s/CCC/CC/g ;  Just because it's Right.
(Thanks Vadim for already doing *FLAGS..)

Fixed libfl Makefile to actually work.

Removed *_DEPS from tmake templates, in every case they can be determined
from the relevant *_OBJS

Added BASE_MSW_OBJS, a couple of missing #includes, some missing files to
the 'dist' targets, and fixed some compile warnings.

Changed setup.py to use wx-config --gl-libs instead of hard coded constants.

 Modified Files:
 	Makefile.in configure configure.in setup.h.in wx-config.in
 	wxBase.spec wxGTK.spec wxMotif.spec
 	contrib/include/wx/applet/window.h contrib/src/Makefile.in
 	contrib/src/applet/appletwindow.cpp contrib/src/fl/Makefile.in
 	debian/changelog debian/control.in debian/libwxbase-dbg.dirs
 	debian/libwxbase-dbg.links debian/libwxbase-dbg.postinst
 	debian/libwxbase-dbg.prerm debian/libwxbase-dev.dirs
 	debian/libwxbase-dev.files debian/libwxbase-dev.links
 	debian/libwxbase-dev.postinst debian/libwxbase-dev.prerm
 	debian/libwxgtk-dbg.dirs debian/libwxgtk-dbg.links
 	debian/libwxgtk-dbg.postinst debian/libwxgtk-dbg.prerm
 	debian/libwxgtk-dev.dirs debian/libwxgtk-dev.files
 	debian/libwxgtk-dev.links debian/libwxgtk-dev.postinst
 	debian/libwxgtk-dev.prerm debian/rules
 	distrib/msw/tmake/base.t distrib/msw/tmake/gtk.t
 	distrib/msw/tmake/mgl.t distrib/msw/tmake/motif.t
 	distrib/msw/tmake/msw.t distrib/msw/tmake/os2.t
 	distrib/msw/tmake/univ.t docs/motif/install.txt
 	include/wx/msw/private.h include/wx/os2/SETUP.H
 	include/wx/os2/SETUP0.H samples/ipc/Makefile.in
 	samples/sockets/Makefile.in src/files.lst src/make.env.in
 	src/makelib.env.in src/makeprog.env.in src/common/strconv.cpp
 	src/gtk/files.lst src/mgl/files.lst src/motif/files.lst
 	src/msw/files.lst src/msw/gsocket.c src/msw/gsockmsw.c
 	src/msw/toplevel.cpp src/msw/utils.cpp src/os2/files.lst
 	src/univ/files.lst wxPython/setup.py
 Added Files:
 	debian/libwxbase-msw-dev.dirs debian/libwxbase-msw-dev.links
 	debian/libwxbase-msw-dev.postinst
 	debian/libwxbase-msw-dev.prerm debian/libwxmsw-dev.dirs
 	debian/libwxmsw-dev.links debian/libwxmsw-dev.postinst
 	debian/libwxmsw-dev.prerm debian/wxwin-doc.doc-base
 	debian/wxwin-headers-msw.dirs
 Removed Files:
 	debian/wxwin-doc.doc-base.in include/wx/setup.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in

@@ -1,11 +1,12 @@
 #
 # File:     makefile.unx
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
-# Updated:  1999
+# Updated:  2001
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
+# Copyright:(c) 2001, Ron Lee
 #
 # Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a
 
@@ -15,17 +16,17 @@ include ./src/make.env
 
 ############## override make.env for PIC ##########################
 
-# Clears all default suffixes
+%.o : %.c
-.SUFFIXES:	.o .cpp .c .cxx
+	$(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
 
-.c.o :
+%.o : %.cpp
-	$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
 
-.cpp.o :
+%.o : %.cxx
-	$(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
 
-.cxx.o :
+%.r : %.rsrc
-	$(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+	$(DEREZ) $^ Carbon.r --useDF > $@
 
 ########################### Paths #################################
 
@@ -44,55 +45,31 @@ VP9 = @top_srcdir@/src/zlib
 VPA = @top_srcdir@/src/regex
 VP10 = @top_srcdir@/src/iodbc
 VP11 = @top_srcdir@/src/msw/ole
-VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
-VP13 = $(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@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' 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@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
 datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
 libdir = @libdir@
-infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
 
 localedir = $(datadir)/locale
 
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = .
+build_libdir = $(top_builddir)/lib
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-# my autoconf doesn't set this
-#INSTALL_SCRIPT = @INSTALL_SCRIPT@
-# maybe do an additional chmod if needed?
 INSTALL_SCRIPT = @INSTALL@
-transform = @program_transform_name@
 
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
@@ -117,6 +94,7 @@ PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
 TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
+REGEXDIR = $(WXDIR)/src/regex
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
@@ -166,7 +144,6 @@ HEADERS = $(ALL_HEADERS)
 # for the objects and depfiles, we might be bulding only part of them
 # depending on configure arguments, so select a subset of ALL
 OBJECTS = @ALL_OBJECTS@
-DEPFILES = @ALL_DEPFILES@
 
 # the object files of sublibraries (we assume that they don't change [often],
 # so we don't generate these lists with tmake but embed them here)
@@ -328,80 +305,49 @@ IODBCOBJS = \
 		prepare.o \
 		result.o
 
-OLEOBJS = \
-		automtn.o \
-		dataobj.o \
-		dropsrc.o \
-		droptgt.o \
-		oleutils.o \
-		uuid.o
 
 ############################## Rules ##################################
 
-BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+SONAME_FLAGS = @SONAME_FLAGS@
-BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@
+SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
 
 all: @WX_ALL@
 
-@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
-	@$(INSTALL) -d ./lib
+	@$(INSTALL) -d $(build_libdir)
-	$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
+	$(AR) $(AROPTIONS) $@ $(OBJECTS)
-	$(RANLIB) ./lib/$@
+	$(RANLIB) $@
 
-@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
-	@$(INSTALL) -d ./lib
+	@$(INSTALL) -d $(build_libdir)
-	$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
+	$(AR) $(AROPTIONS) $@ glcanvas.o
-	$(RANLIB) ./lib/$@
+	$(RANLIB) $@
 
-@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
+$(build_libdir)/@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
-	@$(INSTALL) -d ./lib
+	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
+	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
-@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o @WX_LIBRARY_NAME_SHARED@
+$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
-	@$(INSTALL) -d ./lib
+	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o ./lib/@WX_LIBRARY_NAME_SHARED@ $(EXTRALIBS) $(OPENGLLIBS)
+	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
 
-./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
+$(build_libdir)/@WX_RESOURCES_DARWIN@: $(MACRESOURCES)
-	$(DEREZ) $^ $(DEREZFLAGS) > $@
+	@$(INSTALL) -d $(build_libdir)
+	$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
 
-./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES)
+$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
-	$(REZ) $(REZFLAGS) $^ -o $@
+	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
-
+	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@
-CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
+	cd $(build_libdir) \
-	@$(RM) ./lib/@WX_LIBRARY_LINK1@
-	@$(RM) ./lib/@WX_LIBRARY_LINK2@
-	@$(RM) ./lib/@WX_LIBRARY_LINK3@
-	cd lib \
 		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
 
-CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@
-	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@
-	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@
-	@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+	cd $(build_libdir) \
-	cd lib \
 		&& $(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_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@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
-	cd $(libdir) \
-		&& $(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@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
-	cd $(libdir) \
-		&& $(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
 
@@ -426,7 +372,22 @@ lexer.c:	$(COMMDIR)/lexer.l
 	sed -e "s/unput/PROIO_unput/g"      > lexer.c
 	@$(RM) @LEX_STEM@.c
 
--include $(DEPFILES)
+-include $(OBJECTS:.o=.d)
+
+
+CREATE_INSTALLED_LINKS: preinstall
+	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@
+
+CREATE_INSTALLED_LINKS_GL: preinstall_gl
+	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
 
 afminstall: preinstall
 	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
@@ -438,7 +399,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_NAME@-config
+preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -447,17 +408,19 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
 	@if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
 
-	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
+	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
-	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
+	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
-	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+	$(INSTALL_PROGRAM) $(build_libdir)/@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/@TOOLCHAIN_NAME@
-	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
-	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
+	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
+                    $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 
 	$(INSTALL) -d $(includedir)/wx
+	@# FIXME: This will erroneously install a wx/base dir for wxBase..
 	@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
@@ -476,12 +439,12 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
 	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
 	done
 
-preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
+preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@echo " "
 	@echo " Installing wxWindows OpenGl add-on..."
 	@echo " "
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+	$(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
 
 install: @AFMINSTALL@ @WX_ALL_INSTALLED@
 	@echo " "
@@ -504,16 +467,14 @@ uninstall:
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
-	@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
 	@echo " Removing GL library..."
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
-	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
 	@echo " Removing helper files..."
-	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
+	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 	@$(RM) $(bindir)/wx-config
-	@$(RM) $(bindir)/wx@TOOLKIT_NAME@-config
+	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
 	@$(RM) $(datadir)/wx/afm/*
 	@$(RM) $(datadir)/wx/gs_afm/*
 # FIXME: wxBase doesnt install these next 3 dirs.
@@ -532,8 +493,8 @@ uninstall:
 	done
 	@echo " Removing directories..."
 	@-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/@TOOLCHAIN_NAME@/wx; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; fi
-	@if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
+	@if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@; fi
 	@if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
 	@if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
 	@if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
@@ -573,6 +534,11 @@ ALL_DIST: distclean
 	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
+	mkdir $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/*.{i,}h $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/{Makefile,COPYRIGHT,README,WHATSNEW} $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/{mkh,tests} $(DISTDIR)/src/regex
 
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
@@ -608,7 +574,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/tiff
 	mkdir $(DISTDIR)/src/iodbc
 	mkdir $(DISTDIR)/src/unix
-	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
+	cp $(SRCDIR)/files.lst $(DISTDIR)/src/
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -648,7 +614,7 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
-	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
+	cp @PORT_FILES@ $(DISTDIR)
 	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
 	cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
 	cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
@@ -679,6 +645,7 @@ BASE_DIST: ALL_DIST
 GTK_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
 	cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
+	cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
@@ -689,6 +656,7 @@ GTK_DIST: ALL_GUI_DIST
 MOTIF_DIST: ALL_GUI_DIST
 	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 $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
 	mkdir $(DISTDIR)/src/motif/xmcombo
@@ -701,15 +669,26 @@ MACX_DIST: ALL_GUI_DIST
 
 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
+	mkdir $(DISTDIR)/include/wx/msw/ctl3d
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
+	mkdir $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
+	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
+	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
+	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
+
+	mkdir $(DISTDIR)/src/msw/ole
+	cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
-	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
 DEMOS_DIST: ALL_GUI_DIST
@@ -1203,6 +1182,12 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
 
+	mkdir $(DISTDIR)/samples/widgets
+	mkdir $(DISTDIR)/samples/widgets/icons
+	cp $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets
+	cp $(SAMPDIR)/widgets/*.{cpp,h,rc} $(DISTDIR)/samples/widgets
+	cp $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons
+
 UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
@@ -1266,6 +1251,7 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/ogl
 	mkdir $(DISTDIR)/wxPython/contrib/stc
+	mkdir $(DISTDIR)/wxPython/contrib/xrc
 	mkdir $(DISTDIR)/wxPython/demo
 	mkdir $(DISTDIR)/wxPython/demo/bitmaps
 	mkdir $(DISTDIR)/wxPython/demo/data
@@ -1274,7 +1260,7 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/wxPython
 	mkdir $(DISTDIR)/wxPython/wxPython/lib
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
 
 	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
@@ -1284,6 +1270,7 @@ PYTHON_DIST:
 	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/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/demo/data/* $(DISTDIR)/wxPython/demo/data
@@ -1292,6 +1279,7 @@ PYTHON_DIST:
 	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
+	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
 
 distclean:
 	$(RM) -r _dist_dir
@@ -1314,7 +1302,6 @@ dist-only:
 	fi
 
 dist: @GUIDIST@
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 	@if test "$(USE_GUI)" = 1; then \
@@ -1345,7 +1332,6 @@ bzip-dist-only:
 	fi
 
 bzip-dist: @GUIDIST@
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
 	@if test "$(USE_GUI)" = 1; then \
@@ -1358,24 +1344,41 @@ bzip-dist: @GUIDIST@
 	mv wxDemos demos; \
 	fi
 
-debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
+debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	mkdir $(DISTDIR)/debian
 	-cp $(WXDIR)/debian/* $(DISTDIR)/debian
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	cp $(DOCDIR)/licence.txt $(DISTDIR)/docs
 	cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
 	cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
 	rm -f $(DISTDIR)/*.spec
+
+	@# now prune away a lot of the crap included by using cp -R
+	@# in other dist targets.  Ugly and hardly portable but it
+	@# will run on any Debian box and that's enough for now.
+
+	find $(DISTDIR) \( -name "CVS" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
+			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
+			-print0 | xargs -0 rm -rf
+
 	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 
+debian-native-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
+
+debian-msw-dirs:
+	mkdir $(DISTDIR)/include/wx/msw
+	mkdir $(DISTDIR)/src/msw
+
+
 clean:
 	$(RM) *.o
 	$(RM) *.d
 	$(RM) parser.c
 	$(RM) lexer.c
-	# $(RM) -r ./lib/wx/*
+	$(RM) $(build_libdir)/lib*
-	$(RM) ./lib/lib*
+    # Don't remove this lot, configure will reuse it
+    # if it's still good
+	# $(RM) -r $(build_libdir)/wx/*
 
 cleanall: clean
 
@@ -1393,3 +1396,4 @@ rpm: dist
 	cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
 	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
 	mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .
+

contrib/include/wx/applet/window.h

@@ -42,6 +42,7 @@ class wxQlet;
 class wxLoadPageEvent;
 class wxPageLoadedEvent;
 class wxIncludePrep;
+class wxToolBarBase;
 
 // Declare a linked list of wxApplet pointers
 WX_DECLARE_LIST(wxApplet, wxAppletList);

contrib/src/Makefile.in

@@ -1,6 +1,6 @@
 # $Id$
 
-CONTRIB_SUBDIRS=ogl mmedia stc xrc applet plot canvas animate fl
+CONTRIB_SUBDIRS=ogl mmedia stc xrc plot canvas animate fl #applet
 
 all:
 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done

contrib/src/applet/appletwindow.cpp

@@ -38,7 +38,9 @@
 #include "wx/html/forcelnk.h"
 
 // crt
+#ifdef __WXMSW__
 #include <process.h>        // spawnl()
+#endif
 
 // Include private headers
 #include "wx/applet/applet.h"

contrib/src/fl/Makefile.in

@@ -1,27 +1,57 @@
-#
+# $Id$
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile for wxWindows FrameLayout library (Linux/wxGTK).
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/fl
 
 TARGET_LIBNAME = libfl
-OBJ_EXT	= o
 
-# Version Info.
 LIBVERSION_CURRENT=1
 LIBVERSION_REVISION=0
 LIBVERSION_AGE=0
 
-include $(top_srcdir)/$(libsrc_dir)/files.lst
+HEADER_PATH=$(top_srcdir)/contrib/include/wx
+HEADER_SUBDIR=fl
+
+HEADERS = \
+            bardragpl.h \
+            cbcustom.h \
+            dynbarhnd.h \
+            dyntbarhnd.h \
+            garbagec.h \
+            hintanimpl.h \
+            panedrawpl.h \
+            rowlayoutpl.h \
+            updatesmgr.h \
+            antiflickpl.h \
+            barhintspl.h \
+            controlbar.h \
+            dyntbar.h \
+            frmview.h \
+            gcupdatesmgr.h \
+            newbmpbtn.h \
+            rowdragpl.h \
+            toolwnd.h
+
+OBJECTS  = \
+            antiflickpl.o \
+            gcupdatesmgr.o \
+            rowlayoutpl.o \
+            bardragpl.o \
+            dyntbar.o \
+            hintanimpl.o \
+            toolwnd.o \
+            barhintspl.o \
+            dyntbarhnd.o \
+            newbmpbtn.o \
+            updatesmgr.o \
+            cbcustom.o \
+            frmview.o \
+            panedrawpl.o \
+            controlbar.o \
+            garbagec.o \
+            rowdragpl.o
 
-OBJECTS = $(FL_OBJECTS)
 DEPFILES= $(OBJECTS:.o=.d)
 
 APPEXTRADEFS = -I$(top_srcdir)/contrib/include
@@ -29,3 +59,4 @@ APPEXTRADEFS = -I$(top_srcdir)/contrib/include
 include $(top_builddir)/src/makelib.env
 
 -include $(DEPFILES)
+

debian/changelog

@@ -1,33 +1,59 @@
-wxwindows2.2 (2.3.1) unstable; urgency=low
+wxwindows2.3 (2.3.2) unstable; urgency=low
 
-  * 2.3.1 debs -- still not QA'd for general release yet.
+  * Major Overhaul.  First serious release contender.
 
- -- Ron <ron@debian.org>  Sun, 10 Jun 2001 20:10:36 -0700
+ -- Ron Lee <ron@debian.org>  Thu, 27 Sep 2001 05:55:07 -0700
 
-wxwindows2.2 (2.3.0) unstable; urgency=low
+wxwindows2.3 (2.3.1) unstable; urgency=low
+
+  * 2.3.1 test debs -- still not QA'd for general release yet.
+
+ -- Ron Lee <ron@debian.org>  Sun, 10 Jun 2001 20:10:36 -0700
+
+wxwindows2.3 (2.3.0) unstable; urgency=low
 
   * Updated 2.2 build scripts for 2.3
   * initial test builds, please do not release..
 
  -- Ron Lee <ron@debian.org>  Sat, 27 Jan 2001 01:51:24 -0800
 
+wxwindows2.2 (2.2.8) unstable; urgency=low
+
+  * Fixed bogus samples makefile. Closes: #110061
+  * Added ability to build wxMSW-cross packages, but they
+    are not built and distributed by default.
+
+      If you think such creatures belong in the archive,
+      register your vote by filing a wishlist bug (or preferably
+      append some reasoned response to one already posted ;)
+
+  * Pruned more inapplicable files from the raw cvs source,
+    cleaned configure.in and removed the need for a common setup.h,
+    removed superfluous library links and generally tweaked things
+    so as to make adding new ports easier.
+  * added --gl-libs flag to wx-config.
+
+ -- Ron Lee <ron@debian.org>  Thu, 30 Aug 2001 15:41:49 -0700
+
 wxwindows2.2 (2.2.7) unstable; urgency=medium
 
   * The "Testing Tarantella" release.
   * various small control (mis)behaviours corrected.
   * added missing build-dep for gettext.
+  * updated wxPython description, Closes: #102689
+  * Never publicly released, oh well.
 
- -- Ron <ron@debian.org>  Sun, 10 Jun 2001 19:32:46 -0700
+ -- Ron Lee <ron@debian.org>  Sun, 10 Jun 2001 19:32:46 -0700
 
 wxwindows2.2 (2.2.6.1) unstable; urgency=low
 
   * fix rules so it really doesn't build -indep for ports
-    and fixed ambiguous oveload bug in mmedia contrib.
+    and fixed ambiguous overload bug in mmedia contrib.
     This time it will build on alpha for sure.  Really. :)
     Closes: #92288
   * added extra -dev package deps.  Closes: #91364
 
- -- Ron <ron@aeon.otsys.com>  Sat,  7 Apr 2001 06:49:58 -0700
+ -- Ron Lee <ron@debian.org>  Sat,  7 Apr 2001 06:49:58 -0700
 
 wxwindows2.2 (2.2.6) unstable; urgency=low
 
@@ -39,7 +65,7 @@ wxwindows2.2 (2.2.6) unstable; urgency=low
     likely default use.
   * general buglet count reduced.
 
- -- Ron <ron@debian.org>  Thu,  8 Mar 2001 21:10:07 -0800
+ -- Ron Lee <ron@debian.org>  Thu,  8 Mar 2001 21:10:07 -0800
 
 wxwindows2.2 (2.2.5.1) unstable; urgency=low
 

debian/control.in

@@ -117,10 +117,10 @@ Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
 Depends: python-base (>=1.5.2), ${shlibs:Depends}
-Suggests: wxwin=V-doc
+Suggests: wxwin=V-doc, wxwin=V-examples
 Conflicts: libwxgtk=V-python-contrib, python-wxwin
 Replaces: libwxgtk=V-python-contrib, python-wxwin
-Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
+Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
  wxWindows is a class library for C++ providing GUI (Graphical User
  Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
@@ -204,3 +204,33 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples)
  .
  This package contains examples of using the wxWindows toolkit.
 
+Package: libwxbase-msw=V-dev
+Architecture: i386
+Section: otherosfs
+Depends: wxwin=V-headers-msw (= ${Source-Version})
+Conflicts: libwxbase-msw-dev
+Replaces: libwxbase-msw-dev
+Provides: libwxbase-msw-dev
+Description: wxBase mingw32msvc-cross
+ mingw32msvc-cross wxBase libs.
+
+Package: libwxmsw=V-dev
+Architecture: i386
+Section: otherosfs
+Depends: wxwin=V-headers-msw (= ${Source-Version})
+Conflicts: libwxmsw-dev
+Replaces: libwxmsw-dev
+Provides: libwxmsw-dev
+Description: wxMSW mingw32msvc-cross
+ mingw32msvc-cross wxMSW libs.
+
+Package: wxwin=V-headers-msw
+Architecture: i386
+Section: otherosfs
+Depends: wxwin=V-headers (= ${Source-Version})
+Conflicts: wxwin-headers-msw
+Replaces: wxwin-headers-msw
+Provides: wxwin-headers-msw
+Description: Extra wxWindows headers for mingw32msvc-cross
+ Headers required by the wxWindows mingw32msvc-cross libraries.
+

debian/libwxbase-dbg.dirs

@@ -1,5 +1,5 @@
 usr/bin
-usr/lib/wx/include/wx
+usr/lib/wx/include/based-=V/wx
 usr/share/man/man1
 usr/share/lintian/overrides
 

debian/libwxbase-dbg.links

@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz
 

debian/libwxbase-dbg.postinst

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-config 50
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50
 
 if [ "$1" = "configure" ]; then
 	ldconfig

debian/libwxbase-dbg.prerm

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --remove wx-config /usr/bin/wxbased-config
+update-alternatives --remove wx-config /usr/bin/wxbased-=V-config
 
 #DEBHELPER#
 

debian/libwxbase-dev.dirs

@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/wx/include/wx
+usr/lib/wx/include/base-=V/wx
 usr/share/man/man1

debian/libwxbase-dev.files

@@ -1,4 +1,4 @@
-usr/bin/wxbase-config
+usr/bin/wxbase-=V-config
-usr/lib/wx/include/wx/base/setup.h
+usr/lib/wx/include/base-=V/wx/setup.h
 usr/lib/libwx_base*.so
 

debian/libwxbase-dev.links

@@ -1 +1 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz

debian/libwxbase-dev.postinst

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-config 60
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60
 
 #DEBHELPER#
 

debian/libwxbase-dev.prerm

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --remove wx-config /usr/bin/wxbase-config
+update-alternatives --remove wx-config /usr/bin/wxbase-=V-config
 
 #DEBHELPER#
 

debian/libwxbase-msw-dev.dirs

@@ -0,0 +1,4 @@
+usr/bin
+usr/=H/lib/wx/include/base-=V-=H/wx
+usr/share/man/man1
+

debian/libwxbase-msw-dev.links

@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz
+

debian/libwxbase-msw-dev.postinst

@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40
+
+#DEBHELPER#
+

debian/libwxbase-msw-dev.prerm

@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxbase-=V-=H-config
+
+#DEBHELPER#
+

debian/libwxgtk-dbg.dirs

@@ -1,5 +1,5 @@
 usr/bin
-usr/lib/wx/include/wx/gtkd/
+usr/lib/wx/include/gtkd-=V/wx
 usr/share/man/man1
 usr/share/lintian/overrides
 

debian/libwxgtk-dbg.links

@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz
 

debian/libwxgtk-dbg.postinst

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-config 50
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50
 
 if [ "$1" = "configure" ]; then
 	ldconfig

debian/libwxgtk-dbg.prerm

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --remove wx-config /usr/bin/wxgtkd-config
+update-alternatives --remove wx-config /usr/bin/wxgtkd-=V-config
 
 #DEBHELPER#
 

debian/libwxgtk-dev.dirs

@@ -1,3 +1,4 @@
 usr/bin
-usr/lib/wx/include/wx/gtk/
+usr/lib/wx/include/gtk-=V/wx
 usr/share/man/man1
+

debian/libwxgtk-dev.files

@@ -1,6 +1,4 @@
-usr/bin/wxgtk-config
+usr/bin/wxgtk-=V-config
-usr/lib/wx/include/wx/gtk/setup.h
+usr/lib/wx/include/gtk-=V/wx/setup.h
-usr/lib/libwx_gtk-*.so
+usr/lib/libwx_gtk*.so
-usr/lib/libwx_gtk.so
-usr/lib/libwx_gtk_gl*.so
 

debian/libwxgtk-dev.links

@@ -1 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz
+

debian/libwxgtk-dev.postinst

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-config 70
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-=V-config 70
 
 #DEBHELPER#
 

debian/libwxgtk-dev.prerm

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --remove wx-config /usr/bin/wxgtk-config
+update-alternatives --remove wx-config /usr/bin/wxgtk-=V-config
 
 #DEBHELPER#
 

debian/libwxmsw-dev.dirs

@@ -0,0 +1,4 @@
+usr/bin
+usr/=H/lib/wx/include/msw-=V-=H/wx
+usr/share/man/man1
+

debian/libwxmsw-dev.links

@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmsw-=V-=H-config.1.gz
+

debian/libwxmsw-dev.postinst

@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmsw-=V-=H-config 40
+
+#DEBHELPER#
+

debian/libwxmsw-dev.prerm

@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxmsw-=V-=H-config
+
+#DEBHELPER#
+

debian/rules

@@ -13,6 +13,9 @@ export DH_OPTIONS
 release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
 python_dir:=python$(shell python -c "import sys;print sys.version[:3]")
 
+cross_host=i586-mingw32msvc
+cross_build=$(shell ./config.guess)
+
 # Packages to build:
 package_wxbase_lib=libwxbase$(release)
 package_wxbase_dev=libwxbase$(release)-dev
@@ -28,6 +31,10 @@ package_i18n=wxwin$(release)-i18n
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples
 
+package_wxbase_msw_dev=libwxbase-msw$(release)-dev
+package_msw_dev=libwxmsw$(release)-dev
+package_headers_msw=wxwin$(release)-headers-msw
+
 # Build directories:
 objdir_wxbase_shared=objs_wxbase_sh
 objdir_wxbase_static=objs_wxbase_st
@@ -39,9 +46,14 @@ objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
 objdir_i18n=locale
+
+objdir_wxbase_msw_static=objs_wxbase_msw_st
+objdir_msw_static=objs_msw_st
+
 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
-	$(objdir_doc) $(objdir_examples)
+	$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
+        $(objdir_wxbase_msw_static) $(objdir_msw_static)
 
 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
@@ -56,7 +68,11 @@ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
 
 build_indep_stamps=build-examples-stamp build-doc-stamp
 
-build_stamps=$(build_arch_stamps) $(build_indep_stamps)
+build_cross_stamps=build-wxbase-msw-dev-stamp build-msw-dev-stamp
+
+build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
+
+build_stamps=$(build_stamps_native) $(build_cross_stamps)
 
 # Install targets:
 install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
@@ -66,7 +82,11 @@ install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
 
 install_all_indep=install-examples install-doc
 
-install_all=$(install_all_arch) $(install_all_indep)
+install_all_cross=install-wxbase-msw-dev install-msw-dev install-headers-msw
+
+install_all_native=$(install_all_arch) $(install_all_indep)
+
+install_all=$(install_all_native) $(install_all_cross)
 
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
@@ -79,10 +99,7 @@ wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 debian/control: debian/control.in
 	sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
 
-debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in
+control-files-stamp: debian/control
-	sed -e 's/=V/$(release)/g' < debian/wxwin-doc.doc-base.in > debian/wxwin-doc.doc-base
-
-control-files-stamp: debian/control debian/wxwin-doc.doc-base
 	dh_testdir
 	@for f in dirs postinst; do \
 		echo "generating control file $(package_wxbase_lib).$$f"; \
@@ -90,11 +107,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 	done;
 	@for f in dirs files links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dev).$$f"; \
-		cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
+			> debian/$(package_wxbase_dev).$$f; \
 	done;
 	@for f in dirs links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dbg).$$f"; \
-		cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
+			> debian/$(package_wxbase_dbg).$$f; \
 	done;
 	@for f in dirs postinst; do \
 		echo "generating control file $(package_gtk_lib).$$f"; \
@@ -102,11 +121,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 	done;
 	@for f in dirs files links postinst prerm; do \
 		echo "generating control file $(package_gtk_dev).$$f"; \
-		cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
+			> debian/$(package_gtk_dev).$$f; \
 	done;
 	@for f in dirs links postinst prerm; do \
 		echo "generating control file $(package_gtk_dbg).$$f"; \
-		cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
+			> debian/$(package_gtk_dbg).$$f; \
 	done;
 	@for f in dirs docs files postinst prerm; do \
 		echo "generating control file $(package_gtk_py).$$f"; \
@@ -131,36 +152,57 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 	done;
 	@for f in dirs docs doc-base; do \
 		echo "generating control file $(package_doc).$$f"; \
-		cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
+			> debian/$(package_doc).$$f; \
 	done;
 	@for f in examples; do \
 		echo "generating control file $(package_examples).$$f"; \
 		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
 	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_msw_dev).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
+			> debian/$(package_wxbase_msw_dev).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_msw_dev).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
+			> debian/$(package_msw_dev).$$f; \
+	done;
+	@for f in dirs; do \
+		echo "generating control file $(package_headers_msw).$$f"; \
+		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
+			> debian/$(package_headers_msw).$$f; \
+	done;
 	touch $@
 
 build_arch: control-files-stamp $(build_arch_stamps)
-build_all: control-files-stamp $(build_stamps)
+build_all: control-files-stamp $(build_stamps_native)
 
-# do nothing until we know which binary target is called
+# Really we should probably do nothing here until we know which
-build:
+# binary target is being called, but alpha builds were exploding
+# (compiler segfaults) in random places when building under fakeroot
+# from the binary-arch target.  Build all -arch files here then, and
+# let the -indep stuff fend for itself later.
+
+build: build_arch
 
 
 build-wxbase-shared-stamp:
 	dh_testdir
-	mkdir $(objdir_wxbase_shared)
+	mkdir -p $(objdir_wxbase_shared)
 	cd $(objdir_wxbase_shared) \
 		&& ../configure --prefix=/usr \
 				--cache-file=../config_deb.cache \
 				--disable-gui \
-				--enable-burnt_name \
+				--enable-soname \
 				--with-zlib=sys \
 		&& $(MAKE)
 	touch $@
 
 build-wxbase-static-stamp:
 	dh_testdir
-	mkdir $(objdir_wxbase_static)
+	mkdir -p $(objdir_wxbase_static)
 	cd $(objdir_wxbase_static) \
 		&& ../configure --prefix=/usr \
 				--cache-file=../config_deb.cache \
@@ -172,26 +214,26 @@ build-wxbase-static-stamp:
 
 build-wxbase-debug-stamp:
 	dh_testdir
-	mkdir $(objdir_wxbase_debug)
+	mkdir -p $(objdir_wxbase_debug)
 	cd $(objdir_wxbase_debug) \
 		&& ../configure --prefix=/usr \
 				--cache-file=../config_deb.cache \
 				--disable-gui \
 				--enable-debug \
-				--enable-burnt_name \
+				--enable-soname \
 				--with-zlib=sys \
 		&& $(MAKE)
 	touch $@
 
 build-gtk-shared-stamp:
 	dh_testdir
-	mkdir $(objdir_gtk_shared)
+	mkdir -p $(objdir_gtk_shared)
 	cd $(objdir_gtk_shared) \
 		&& ../configure --prefix=/usr \
 				--cache-file=../config_deb.cache \
 				--with-gtk \
 				--with-opengl \
-				--enable-burnt_name \
+				--enable-soname \
 				--with-zlib=sys \
 				--with-libjpeg=sys \
 				--with-libpng=sys \
@@ -201,7 +243,7 @@ build-gtk-shared-stamp:
 
 build-gtk-static-stamp:
 	dh_testdir
-	mkdir $(objdir_gtk_static)
+	mkdir -p $(objdir_gtk_static)
 	cd $(objdir_gtk_static) \
 		&& ../configure --prefix=/usr \
 				--cache-file=../config_deb.cache \
@@ -217,14 +259,14 @@ build-gtk-static-stamp:
 
 build-gtk-debug-stamp:
 	dh_testdir
-	mkdir $(objdir_gtk_debug)
+	mkdir -p $(objdir_gtk_debug)
 	cd $(objdir_gtk_debug) \
 		&& ../configure --prefix=/usr \
 				--cache-file=../config_deb.cache \
 				--with-gtk \
 				--with-opengl \
 				--enable-debug \
-				--enable-burnt_name \
+				--enable-soname \
 				--with-zlib=sys \
 				--with-libjpeg=sys \
 				--with-libpng=sys \
@@ -258,7 +300,7 @@ build-doc-stamp: build-gtk-shared-stamp
 	mkdir $(objdir_doc)
 	mkdir $(objdir_doc_cruft)
 	cd $(objdir_doc_cruft) \
-		&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
+		&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
 		   ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
 		   ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html
 	cp docs/latex/wx/*.gif $(objdir_doc)
@@ -267,10 +309,15 @@ build-doc-stamp: build-gtk-shared-stamp
 	      $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
 	touch $@
 
-build-examples-stamp:
+build-examples-stamp: build-gtk-shared-stamp
 	dh_testdir
-	mkdir $(objdir_examples)
+	mkdir -p $(objdir_examples)
+
+	# copy all samples and the Makefile generated for libwxgtk.
 	cp -a samples $(objdir_examples)
+	rm -f $(objdir_examples)/samples/Makefile
+	cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
+
 	cp -a demos $(objdir_examples)
 	cp -a wxPython/demo $(objdir_examples)/wxPython
 	@for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
@@ -292,6 +339,33 @@ build-i18n-stamp: build-gtk-shared-stamp
 		&& $(MAKE) allmo
 	touch $@
 
+build-wxbase-msw-dev-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_static)
+	cd $(objdir_wxbase_msw_static) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=../config_deb.cache \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+				--disable-shared \
+		&& $(MAKE)
+	touch $@
+
+build-msw-dev-stamp:
+	dh_testdir
+	mkdir -p $(objdir_msw_static)
+	cd $(objdir_msw_static) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=../config_deb.cache \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--with-mingw \
+				--disable-shared \
+		&& $(MAKE)
+	touch $@
+
+
 clean: debian/control
 	dh_testdir
 	dh_testroot
@@ -312,10 +386,13 @@ clean: debian/control
 	rm -f debian/$(package_i18n).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
+	rm -f debian/$(package_wxbase_msw_dev).*
+	rm -f debian/$(package_msw_dev).*
+	rm -f debian/$(package_headers_msw).*
 
 install_arch: build_arch $(install_all_arch)
 
-install: build_all $(install_all)
+install: build_all $(install_all_native)
 
 install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
 install-wxbase-lib: build-wxbase-shared-stamp
@@ -324,7 +401,7 @@ install-wxbase-lib: build-wxbase-shared-stamp
 	dh_clean -k
 	dh_installdirs
 	cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib
-	cp $(objdir_wxbase_shared)/wxbase-config debian/$(package_wxbase_lib)/usr/bin/
+	cp $(objdir_wxbase_shared)/wxbase-$(release)-config debian/$(package_wxbase_lib)/usr/bin/
 
 install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
 install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
@@ -342,7 +419,7 @@ install-wxbase-dbg: build-wxbase-debug-stamp
 	dh_clean -k
 	dh_installdirs
 	cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
-	cp $(objdir_wxbase_debug)/wxbased-config debian/$(package_wxbase_dbg)/usr/bin/
+	cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/
 	cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
 
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
@@ -371,7 +448,7 @@ install-gtk-dbg: build-gtk-debug-stamp
 	dh_clean -k
 	dh_installdirs
 	cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
-	cp $(objdir_gtk_debug)/wxgtkd-config debian/$(package_gtk_dbg)/usr/bin/
+	cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
@@ -441,6 +518,45 @@ install-examples: build-examples-stamp
 	dh_clean -k
 	dh_installdirs
 
+install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
+install-wxbase-msw-dev: build-wxbase-msw-dev-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_msw_static)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_wxbase_msw_static)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
+	$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
+
+install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
+install-msw-dev: build-msw-dev-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_msw_static)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_msw_static)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
+	$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
+
+install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
+install-headers-msw:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	@# Symlink all the headers that will be installed by the main -headers
+	@# package to where the cross compiler will expect them.
+	@for f in `ls -1 include/wx`; do \
+		ln -s /usr/include/wx/$$f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx; \
+		echo "linking header /usr/include/wx/$$f"; \
+	done;
+	@# But install this lot for real.
+	rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/msw
+	cp -a include/wx/msw debian/$(package_headers_msw)/usr/$(cross_host)/include/wx
+	@# and remove this cruft(?)
+	rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/treelay.h
+
+
 binary-common:
 	dh_testdir
 	dh_testroot
@@ -448,7 +564,11 @@ binary-common:
 	dh_installchangelogs
 	dh_installexamples
 	dh_link
-	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg)
+
+	@# Don't strip debug libs at all, and strip cross libs elsewhere
+	@# with the cross host tools until dh_strip gets smarter.
+	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) -N$(package_wxbase_msw_dev) -N$(package_msw_dev)
+
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -N$(package_gtk_py) -V
@@ -462,15 +582,29 @@ binary-common:
 # Note that you currently can't build the indep packages without first
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+	$(MAKE) -f debian/rules \
+	DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
+	binary-common
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+	$(MAKE) -f debian/rules \
+	DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
+	binary-common
 
 # Build all packages target.
 binary: binary-arch binary-indep
 
+# This is a special target for building the wxMSW-cross packages.
+# It's not currently called during the official package build run
+# but may be run separately to build the extra packages.
+# There is an implied build dep on the mingw32 cross compiler 
+# that is not in the control file.
+binary-cross: control-files-stamp $(install_all_cross)
+	$(MAKE) -f debian/rules \
+	DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_msw_dev) -p$(package_headers_msw)" \
+	binary-common
+
 
 ############################################################################
 #
@@ -511,8 +645,10 @@ binary-doc: control-files-stamp install-doc
 
 .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
-	binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \
+	binary-wxbase-dbg binary-doc binary-cross \
+	install install_arch install-wxbase-lib \
         install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
         install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
-        install-gtk-py install-headers install-i18n install-doc install-examples
+        install-gtk-py install-headers install-i18n install-doc install-examples \
+	install-wxbase-msw-dev install-msw-dev install-headers-msw
 

debian/wxwin-headers-msw.dirs

@@ -0,0 +1,2 @@
+usr/=H/include/wx
+

distrib/msw/tmake/base.t

@@ -15,33 +15,36 @@
     #! find all our sources
     foreach $file (sort keys %wxBase) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"BASE_SOURCES"} .= "common/" . $file . " ";
         $project{"BASE_OBJS"} .= $fileobj . " ";
-        $project{"BASE_DEPS"} .= $filedep . " ";
     }
 
     foreach $file (sort keys %wxCommon) {
         next unless $wxCommon{$file} =~ /\bB\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"BASE_SOURCES"} .= "common/" . $file . " ";
         $project{"BASE_OBJS"} .= $fileobj . " ";
-        $project{"BASE_DEPS"} .= $filedep . " ";
     }
 
     foreach $file (sort keys %wxUNIX) {
         next unless $wxUNIX{$file} =~ /\bB\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"BASE_SOURCES"} .= "unix/" . $file . " ";
         $project{"BASE_UNIX_OBJS"} .= $fileobj . " ";
-        $project{"BASE_UNIX_DEPS"} .= $filedep . " ";
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        next unless $wxMSW{$file} =~ /\bB\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"BASE_SOURCES"} .= "msw/" . $file . " ";
+        $project{"BASE_MSW_OBJS"} .= $fileobj . " ";
     }
 
     #! find all our headers
@@ -57,6 +60,12 @@
         $project{"BASE_HEADERS"} .= "unix/" . $file . " "
     }
 
+    foreach $file (sort keys %wxMSWINCLUDE) {
+        next unless $wxMSWINCLUDE{$file} =~ /\bB\b/;
+
+        $project{"BASE_HEADERS"} .= "msw/" . $file . " "
+    }
+
     foreach $file (sort keys %wxPROTOCOLINCLUDE) {
         next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/;
 
@@ -74,11 +83,10 @@ ALL_HEADERS = \
 BASE_OBJS = \
 		#$ ExpandList("BASE_OBJS");
 
-BASE_DEPS = \
-		#$ ExpandList("BASE_DEPS");
-
 BASE_UNIX_OBJS = \
 		#$ ExpandList("BASE_UNIX_OBJS");
 
-BASE_DEPS = \
+BASE_MSW_OBJS = \
-		#$ ExpandList("BASE_DEPS");
+		#$ ExpandList("BASE_MSW_OBJS");
+
+

distrib/msw/tmake/gtk.t

@@ -14,60 +14,48 @@
 
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
-    $project{"COMMONDEPS"} .= "parser.d ";
 
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bR\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "generic/" . $file . " ";
         $project{"GENERICOBJS"} .= $fileobj . " ";
-        $project{"GENERICDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxCommon) {
         next if $wxCommon{$file} =~ /\bR\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "common/" . $file . " ";
         $project{"COMMONOBJS"} .= $fileobj . " ";
-        $project{"COMMONDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxGTK) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "gtk/" . $file . " ";
         $project{"GUIOBJS"} .= $fileobj . " ";
-        $project{"GUIDEPS"} .= $filedep . " ";
 
         if ( $wxGTK{$file} =~ /\bL\b/ ) {
             $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
-            $project{"GUI_LOWLEVEL_DEPS"} .= $filedep . " ";
         }
     }
 
     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "unix/" . $file . " ";
         $project{"UNIXOBJS"} .= $fileobj . " ";
-        $project{"UNIXDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxHTML) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "html/" . $file . " ";
         $project{"HTMLOBJS"} .= $fileobj . " ";
-        $project{"HTMLDEPS"} .= $filedep . " "
     }
 
     #! find all our headers
@@ -108,36 +96,18 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		#$ ExpandList("COMMONOBJS");
 
-COMMONDEPS = \
-		#$ ExpandList("COMMONDEPS");
-
 GENERICOBJS = \
 		#$ ExpandList("GENERICOBJS");
 
-GENERICDEPS = \
-		#$ ExpandList("GENERICDEPS");
-
 GUIOBJS = \
 		#$ ExpandList("GUIOBJS");
 
-GUIDEPS = \
-		#$ ExpandList("GUIDEPS");
-
 GUI_LOWLEVEL_OBJS = \
 		#$ ExpandList("GUI_LOWLEVEL_OBJS");
 
-GUI_LOWLEVEL_DEPS = \
-		#$ ExpandList("GUI_LOWLEVEL_DEPS");
-
 UNIXOBJS = \
 		#$ ExpandList("UNIXOBJS");
 
-UNIXDEPS = \
-		#$ ExpandList("UNIXDEPS");
-
 HTMLOBJS = \
 		#$ ExpandList("HTMLOBJS");
 
-HTMLDEPS = \
-		#$ ExpandList("HTMLDEPS");
-

distrib/msw/tmake/mgl.t

@@ -14,60 +14,48 @@
 
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
-    $project{"COMMONDEPS"} .= "parser.d ";
 
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bNotMGL\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MGL_SOURCES"} .= "generic/" . $file . " ";
         $project{"GENERICOBJS"} .= $fileobj . " ";
-        $project{"GENERICDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxCommon) {
         next if $wxCommon{$file} =~ /\bNotMGL\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MGL_SOURCES"} .= "common/" . $file . " ";
         $project{"COMMONOBJS"} .= $fileobj . " ";
-        $project{"COMMONDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxMGL) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MGL_SOURCES"} .= "mgl/" . $file . " ";
 #!        $project{"GUIOBJS"} .= $fileobj . " ";
-#!        $project{"GUIDEPS"} .= $filedep . " ";
 
         if ( $wxMGL{$file} =~ /\bL\b/ ) {
             $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
-            $project{"GUI_LOWLEVEL_DEPS"} .= $filedep . " ";
         }
     }
 
     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MGL_SOURCES"} .= "unix/" . $file . " ";
         $project{"UNIXOBJS"} .= $fileobj . " ";
-        $project{"UNIXDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxHTML) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MGL_SOURCES"} .= "html/" . $file . " ";
         $project{"HTMLOBJS"} .= $fileobj . " ";
-        $project{"HTMLDEPS"} .= $filedep . " "
     }
 
     #! find all our headers
@@ -106,36 +94,18 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		#$ ExpandList("COMMONOBJS");
 
-COMMONDEPS = \
-		#$ ExpandList("COMMONDEPS");
-
 GENERICOBJS = \
 		#$ ExpandList("GENERICOBJS");
 
-GENERICDEPS = \
-		#$ ExpandList("GENERICDEPS");
-
 #!GUIOBJS = \
 #!		#$ ExpandList("GUIOBJS");
 #!
-#!GUIDEPS = \
-#!		#$ ExpandList("GUIDEPS");
-
 GUI_LOWLEVEL_OBJS = \
 		#$ ExpandList("GUI_LOWLEVEL_OBJS");
 
-GUI_LOWLEVEL_DEPS = \
-		#$ ExpandList("GUI_LOWLEVEL_DEPS");
-
 UNIXOBJS = \
 		#$ ExpandList("UNIXOBJS");
 
-UNIXDEPS = \
-		#$ ExpandList("UNIXDEPS");
-
 HTMLOBJS = \
 		#$ ExpandList("HTMLOBJS");
 
-HTMLDEPS = \
-		#$ ExpandList("HTMLDEPS");
-

distrib/msw/tmake/motif.t

@@ -14,56 +14,45 @@
 
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
-    $project{"COMMONDEPS"} .= "parser.d ";
     $project{"GUIOBJS"} .= "xmcombo.o ";
 
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bX\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MOTIF_SOURCES"} .= "generic/" . $file . " ";
         $project{"GENERICOBJS"} .= $fileobj . " ";
-        $project{"GENERICDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxCommon) {
         next if $wxCommon{$file} =~ /\bX\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MOTIF_SOURCES"} .= "common/" . $file . " ";
         $project{"COMMONOBJS"} .= $fileobj . " ";
-        $project{"COMMONDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxMOTIF) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MOTIF_SOURCES"} .= "motif/" . $file . " ";
         $project{"GUIOBJS"} .= $fileobj . " ";
-        $project{"GUIDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MOTIF_SOURCES"} .= "unix/" . $file . " ";
         $project{"UNIXOBJS"} .= $fileobj . " ";
-        $project{"UNIXDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxHTML) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MOTIF_SOURCES"} .= "html/" . $file . " ";
         $project{"HTMLOBJS"} .= $fileobj . " ";
-        $project{"HTMLDEPS"} .= $filedep . " "
     }
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
@@ -103,29 +92,15 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		#$ ExpandList("COMMONOBJS");
 
-COMMONDEPS = \
-		#$ ExpandList("COMMONDEPS");
-
 GENERICOBJS = \
 		#$ ExpandList("GENERICOBJS");
 
-GENERICDEPS = \
-		#$ ExpandList("GENERICDEPS");
-
 GUIOBJS = \
 		#$ ExpandList("GUIOBJS");
 
-GUIDEPS = \
-		#$ ExpandList("GUIDEPS");
-
 UNIXOBJS = \
 		#$ ExpandList("UNIXOBJS");
 
-UNIXDEPS = \
-		#$ ExpandList("UNIXDEPS");
-
 HTMLOBJS = \
 		#$ ExpandList("HTMLOBJS");
 
-HTMLDEPS = \
-		#$ ExpandList("HTMLDEPS");

distrib/msw/tmake/msw.t

@@ -14,54 +14,44 @@
 
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
-    $project{"COMMONDEPS"} .= "parser.d ";
 
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MSW_SOURCES"} .= "generic/" . $file . " ";
         $project{"GENERICOBJS"} .= $fileobj . " ";
-        $project{"GENERICDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxCommon) {
         next if $wxCommon{$file} =~ /\bR\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MSW_SOURCES"} .= "common/" . $file . " ";
         $project{"COMMONOBJS"} .= $fileobj . " ";
-        $project{"COMMONDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxMSW) {
         next if $wxMSW{$file} =~ /\b16\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         if( $wxMSW{$file} =~ /\bO\b/ ) {
             $project{"MSW_SOURCES"} .= "msw/ole/" . $file . " ";
             $project{"OLEOBJS"} .= $fileobj . " ";
-            $project{"OLEDEPS"} .= $filedep . " ";
         } else {
             $project{"MSW_SOURCES"} .= "msw/" . $file . " ";
             $project{"GUIOBJS"} .= $fileobj . " ";
-            $project{"GUIDEPS"} .= $filedep . " ";
         }
     }
 
     foreach $file (sort keys %wxHTML) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MSW_SOURCES"} .= "html/" . $file . " ";
         $project{"HTMLOBJS"} .= $fileobj . " ";
-        $project{"HTMLDEPS"} .= $filedep . " "
     }
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
@@ -99,41 +89,15 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		#$ ExpandList("COMMONOBJS");
 
-COMMONDEPS = \
-		#$ ExpandList("COMMONDEPS");
-
 GENERICOBJS = \
 		#$ ExpandList("GENERICOBJS");
 
-GENERICDEPS = \
-		#$ ExpandList("GENERICDEPS");
-
 GUIOBJS = \
 		#$ ExpandList("GUIOBJS");
 
-GUIDEPS = \
-		#$ ExpandList("GUIDEPS");
-
-UNIXOBJS = \
-		#$ ExpandList("UNIXOBJS");
-
-UNIXDEPS = \
-		#$ ExpandList("UNIXDEPS");
-
 HTMLOBJS = \
 		#$ ExpandList("HTMLOBJS");
 
-HTMLDEPS = \
-		#$ ExpandList("HTMLDEPS");
-
 OLEOBJS = \
 		#$ ExpandList("OLEOBJS");
 
-OLEDEPS = \
-		#$ ExpandList("OLEDEPS");
-
-IODBCOBJS = \
-		#$ ExpandList("IODBCOBJS");
-
-IODBCDEPS = \
-		#$ ExpandList("IODBCDEPS");

distrib/msw/tmake/os2.t

@@ -15,46 +15,37 @@
 
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
-    $project{"COMMONDEPS"} .= "parser.d ";
 
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bP\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"OS2PM_SOURCES"} .= "generic/" . $file . " ";
         $project{"GENERICOBJS"} .= $fileobj . " ";
-        $project{"GENERICDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxCommon) {
         next if $wxCommon{$file} =~ /\bP\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"OS2PM_SOURCES"} .= "common/" . $file . " ";
         $project{"COMMONOBJS"} .= $fileobj . " ";
-        $project{"COMMONDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxOS2PM) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"OS2PM_SOURCES"} .= "os2/" . $file . " ";
         $project{"GUIOBJS"} .= $fileobj . " ";
-        $project{"GUIDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxHTML) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"OS2PM_SOURCES"} .= "html/" . $file . " ";
         $project{"HTMLOBJS"} .= $fileobj . " ";
-        $project{"HTMLDEPS"} .= $filedep . " "
     }
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
@@ -90,30 +81,15 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		#$ ExpandList("COMMONOBJS");
 
-COMMONDEPS = \
-		#$ ExpandList("COMMONDEPS");
-
 GENERICOBJS = \
 		#$ ExpandList("GENERICOBJS");
 
-GENERICDEPS = \
-		#$ ExpandList("GENERICDEPS");
-
 GUIOBJS = \
 		#$ ExpandList("GUIOBJS");
 
-GUIDEPS = \
-		#$ ExpandList("GUIDEPS");
-
 UNIXOBJS = \
 		#$ ExpandList("UNIXOBJS");
 
-UNIXDEPS = \
-		#$ ExpandList("UNIXDEPS");
-
 HTMLOBJS = \
 		#$ ExpandList("HTMLOBJS");
 
-HTMLDEPS = \
-		#$ ExpandList("HTMLDEPS");
-

distrib/msw/tmake/univ.t

@@ -15,19 +15,14 @@
     #! find all our sources
     foreach $file (sort keys %wxUNIV) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"UNIV_SOURCES"} .= "univ/" . $file . " ";
         $project{"UNIVOBJS"} .= $fileobj . " ";
-        $project{"UNIVDEPS"} .= $filedep . " ";
     }
 
 #$}
 # This file was automatically generated by tmake at #$ Now()
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
 UNIVOBJS = \
 		#$ ExpandList("UNIVOBJS");
 
-UNIVDEPS = \
-		#$ ExpandList("UNIVDEPS");
-

docs/motif/install.txt

@@ -243,10 +243,10 @@ Usage:
 	./configure options
 
 If you want to use system's C and C++ compiler,
-set environment variables CC and CCC as
+set environment variables CXX and CC as
 
 	% setenv CC cc
-	% setenv CCC CC
+	% setenv CXX CC
 	% ./configure options
 
 to see all the options please use:
@@ -432,13 +432,13 @@ g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
 Using this way, a make file for the minimal sample would look
 like this
 
-CC = g++
+CXX = g++
 
 minimal: minimal.o
-    $(CC) -o minimal minimal.o `wx-config --libs` 
+    $(CXX) -o minimal minimal.o `wx-config --libs` 
 
 minimal.o: minimal.cpp mondrian.xpm
-    $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o
+    $(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o
 
 clean: 
 	rm -f *.o minimal

include/wx/msw/private.h

@@ -28,6 +28,8 @@
 // undefine conflicting symbols which were defined in windows.h
 #include "wx/msw/winundef.h"
 
+#include "wx/log.h"
+
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
 

include/wx/os2/setup.h

@@ -226,10 +226,6 @@
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.
 
-#define wxUSE_WXCONFIG      1
-                                  // if enabled, compiles built-in OS independent wxConfig
-                                  // class and it's file (any platform) and registry (Win)
-                                  // based implementations
 #define wxUSE_THREADS       1
                                   // support for multithreaded applications: if
                                   // 1, compile in thread classes (thread.h)

include/wx/os2/setup0.h

@@ -226,10 +226,6 @@
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.
 
-#define wxUSE_WXCONFIG      1
-                                  // if enabled, compiles built-in OS independent wxConfig
-                                  // class and it's file (any platform) and registry (Win)
-                                  // based implementations
 #define wxUSE_THREADS       1
                                   // support for multithreaded applications: if
                                   // 1, compile in thread classes (thread.h)

include/wx/setup.h

@@ -1,78 +0,0 @@
-/*
- * The main configuration file for wxWindows.
- *
- * NB: this file can be included in .c files, so it must be compileable by a C
- *     compiler - use #ifdef __cplusplus for C++ specific features and avoid
- *     using C++ style comments
- */
-
-#ifndef _WX_SETUP_H_BASE_
-#define _WX_SETUP_H_BASE_
-
-/* compatibility code, to be removed asap: */
-
-#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
-#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXMSW__,__WXGTK__,__WXMOTIF__,__WXSTUBS__,__WXMAC__,__WXPM__
-#endif
-
-/*
-  wxUniversal is defined together with one of other ports, so test for it
-  first
- */
-#ifdef __WXUNIVERSAL__
-#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
-#include "wx/univd/setup.h"
-#else
-#include "wx/univ/setup.h"
-#endif
-
-#elif defined(__WXBASE__)
-#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
-#include "wx/based/setup.h"
-#else
-#include "wx/base/setup.h"
-#endif
-
-#elif defined(__VMS)
-#include "wx_root:[wxwindows]setup.h"
-#elif defined(__WXMSW__)
-#include "wx/msw/setup.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/setup.h"
-
-#elif defined(__WXMOTIF__)
-#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
-#include "wx/motifd/setup.h"
-#else
-#include "wx/motif/setup.h"
-#endif
-
-#elif defined(__WXPM__)
-#include "wx/os2/setup.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/setup.h"
-
-#elif defined(__WXGTK__)
-#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
-#include "wx/gtkd/setup.h"
-#else
-#include "wx/gtk/setup.h"
-#endif
-
-#endif
-
-#include "wx/chkconf.h"
-
-/*
-   define some constants identifying wxWindows version in more details than
-   just the version number
- */
-
-/* wxLogChain class available */
-#define wxHAS_LOG_CHAIN
-
-/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
-#undef wxHAS_WORKING_GTK_DC_BLIT
-
-#endif /* _WX_SETUP_H_BASE_ */
-

samples/ipc/Makefile.in

@@ -21,7 +21,7 @@ VPATH = @PATH_IFS@$(top_srcdir)/samples/ipc # ':' for autoconf
 .SUFFIXES:	.o .cpp .c .cxx
 
 .cpp.o :
-	$(CC) -c $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) -o $@ $<
 
 # Set defaults from configure
 include ../../src/make.env
@@ -29,10 +29,10 @@ include ../../src/make.env
 all:	client server
 
 client:	client.o ../../lib/@WX_TARGET_LIBRARY@
-	$(CC) $(LDFLAGS) -o client client.o $(LDLIBS)
+	$(CXX) $(LDFLAGS) -o client client.o $(LDLIBS)
 
 server:	server.o ../../lib/@WX_TARGET_LIBRARY@
-	$(CC) $(LDFLAGS) -o server server.o $(LDLIBS)
+	$(CXX) $(LDFLAGS) -o server server.o $(LDLIBS)
 
 clean:
 	rm -f $(OBJECTS) $(PROGRAM) core

samples/sockets/Makefile.in

@@ -21,7 +21,7 @@ VPATH = @PATH_IFS@$(top_srcdir)/samples/sockets # ':' for autoconf
 .SUFFIXES:	.o .cpp .c .cxx
 
 .cpp.o :
-	$(CC) -c $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) -o $@ $<
 
 # Set defaults from configure
 include ../../src/make.env
@@ -29,13 +29,13 @@ include ../../src/make.env
 all:	client@PROGRAM_EXT@ server@PROGRAM_EXT@
 
 sockets_resources.o:  sockets.rc
-	$(RESCOMP) $(RCINPUTSWITCH) $< $(RCOUTPUTSWITCH) $@ $(RESFLAGS)
+	$(RESCOMP) -i $< -o $@ $(RESFLAGS)
 
 client@PROGRAM_EXT@:	client.o ../../lib/@WX_TARGET_LIBRARY@ sockets_resources.o
-	$(CC) $(LDFLAGS) -o client@PROGRAM_EXT@ sockets_resources.o client.o $(LDLIBS)
+	$(CXX) $(LDFLAGS) -o client@PROGRAM_EXT@ sockets_resources.o client.o $(LDLIBS)
 
 server@PROGRAM_EXT@:	server.o ../../lib/@WX_TARGET_LIBRARY@
-	$(CC) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS)
+	$(CXX) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS)
 
 clean:
 	rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o client.o server.o core

setup.h.in

@@ -1008,4 +1008,25 @@
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
+
+/* --------------------------------------------------------*
+ *  This stuff is static, it doesn't get modified directly
+ *  by configure.
+*/
+
+#include "wx/chkconf.h"
+
+/*
+   define some constants identifying wxWindows version in more details than
+   just the version number
+ */
+
+/* wxLogChain class available */
+#define wxHAS_LOG_CHAIN
+
+/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
+#undef wxHAS_WORKING_GTK_DC_BLIT
+
+
 #endif /* __WX_SETUP_H__ */
+

src/common/strconv.cpp

@@ -641,7 +641,7 @@ public:
         size_t outbuf = n;
         size_t res, cres;
         
-        wchar_t *tmpbuf;
+        wchar_t *tmpbuf = 0;
 
         if (g_wcNeedsSwap)
         {

src/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:17, 2001/09/17
+# This file was automatically generated by tmake at 16:49, 2001/09/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
 		common/init.cpp \
@@ -69,7 +69,19 @@ ALL_SOURCES = \
 		unix/mimetype.cpp \
 		unix/snglinst.cpp \
 		unix/threadpsx.cpp \
-		unix/utilsunx.cpp
+		unix/utilsunx.cpp \
+		msw/dde.cpp \
+		msw/dir.cpp \
+		msw/gsocket.c \
+		msw/gsockmsw.c \
+		msw/main.cpp \
+		msw/mimetype.cpp \
+		msw/regconf.cpp \
+		msw/registry.cpp \
+		msw/snglinst.cpp \
+		msw/thread.cpp \
+		msw/utils.cpp \
+		msw/utilsexc.cpp
 
 ALL_HEADERS = \
 		app.h \
@@ -152,6 +164,8 @@ ALL_HEADERS = \
 		zstream.h \
 		unix/gsockunx.h \
 		unix/mimetype.h \
+		msw/dde.h \
+		msw/mimetype.h \
 		protocol/file.h \
 		protocol/ftp.h \
 		protocol/http.h \
@@ -222,71 +236,6 @@ BASE_OBJS = \
 		zipstrm.o \
 		zstream.o
 
-BASE_DEPS = \
-		init.d \
-		appcmn.d \
-		cmdline.d \
-		config.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbtable.d \
-		dircmn.d \
-		dynarray.d \
-		dynlib.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontmap.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		hash.d \
-		http.d \
-		intl.d \
-		ipcbase.d \
-		list.d \
-		log.d \
-		longlong.d \
-		memory.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		object.d \
-		objstrm.d \
-		process.d \
-		protocol.d \
-		regex.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		sysopt.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		variant.d \
-		wfstream.d \
-		wxchar.d \
-		zipstrm.d \
-		zstream.d
-
 BASE_UNIX_OBJS = \
 		dir.o \
 		gsocket.o \
@@ -295,67 +244,18 @@ BASE_UNIX_OBJS = \
 		threadpsx.o \
 		utilsunx.o
 
-BASE_DEPS = \
+BASE_MSW_OBJS = \
-		init.d \
+		dde.o \
-		appcmn.d \
+		dir.o \
-		cmdline.d \
+		gsocket.o \
-		config.d \
+		gsockmsw.o \
-		datetime.d \
+		main.o \
-		datstrm.d \
+		mimetype.o \
-		db.d \
+		regconf.o \
-		dbtable.d \
+		registry.o \
-		dircmn.d \
+		snglinst.o \
-		dynarray.d \
+		thread.o \
-		dynlib.d \
+		utils.o \
-		encconv.d \
+		utilsexc.o
-		event.d \
+
-		extended.d \
+
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontmap.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		hash.d \
-		http.d \
-		intl.d \
-		ipcbase.d \
-		list.d \
-		log.d \
-		longlong.d \
-		memory.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		object.d \
-		objstrm.d \
-		process.d \
-		protocol.d \
-		regex.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		sysopt.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		variant.d \
-		wfstream.d \
-		wxchar.d \
-		zipstrm.d \
-		zstream.d

src/gtk/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:54, 2001/09/26
+# This file was automatically generated by tmake at 16:51, 2001/09/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -725,127 +725,6 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-COMMONDEPS = \
-		parser.d \
-		appcmn.d \
-		choiccmn.d \
-		clipcmn.d \
-		cmdline.d \
-		cmdproc.d \
-		cmndata.d \
-		config.d \
-		containr.d \
-		cshelp.d \
-		ctrlcmn.d \
-		ctrlsub.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbgrid.d \
-		dbtable.d \
-		dcbase.d \
-		dircmn.d \
-		dlgcmn.d \
-		dndcmn.d \
-		dobjcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		effects.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		fddlgcmn.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontcmn.d \
-		fontmap.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		gaugecmn.d \
-		gdicmn.d \
-		geometry.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagall.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		imagtiff.d \
-		imagxpm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		lboxcmn.d \
-		list.d \
-		log.d \
-		longlong.d \
-		matrix.d \
-		memory.d \
-		menucmn.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		nbkbase.d \
-		object.d \
-		objstrm.d \
-		paper.d \
-		popupcmn.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		quantize.d \
-		radiocmn.d \
-		regex.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		sysopt.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		toplvcmn.d \
-		treebase.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		valgen.d \
-		validate.d \
-		valtext.d \
-		variant.d \
-		wfstream.d \
-		wincmn.d \
-		wxchar.d \
-		wxexpr.d \
-		xpmdecod.d \
-		zipstrm.d \
-		zstream.d
-
 GENERICOBJS = \
 		accel.o \
 		busyinfo.o \
@@ -895,55 +774,6 @@ GENERICOBJS = \
 		treelay.o \
 		wizard.o
 
-GENERICDEPS = \
-		accel.d \
-		busyinfo.d \
-		calctrl.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirctrlg.d \
-		dirdlgg.d \
-		dragimgg.d \
-		fdrepdlg.d \
-		filedlgg.d \
-		fontdlgg.d \
-		grid.d \
-		gridctrl.d \
-		gridsel.d \
-		helpext.d \
-		helphtml.d \
-		helpwxht.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.d \
-		logg.d \
-		msgdlgg.d \
-		numdlgg.d \
-		paletteg.d \
-		panelg.d \
-		printps.d \
-		prntdlgg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrlwing.d \
-		spinctlg.d \
-		splash.d \
-		splitter.d \
-		statusbr.d \
-		tabg.d \
-		tbarsmpl.d \
-		textdlgg.d \
-		tipdlg.d \
-		tipwin.d \
-		treectlg.d \
-		treelay.d \
-		wizard.d
-
 GUIOBJS = \
 		app.o \
 		bitmap.o \
@@ -1008,70 +838,6 @@ GUIOBJS = \
 		win_gtk.o \
 		window.o
 
-GUIDEPS = \
-		app.d \
-		bitmap.d \
-		bmpbuttn.d \
-		brush.d \
-		button.d \
-		checkbox.d \
-		checklst.d \
-		choice.d \
-		clipbrd.d \
-		colour.d \
-		combobox.d \
-		control.d \
-		cursor.d \
-		data.d \
-		dataobj.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcscreen.d \
-		dialog.d \
-		dnd.d \
-		evtloop.d \
-		font.d \
-		fontdlg.d \
-		frame.d \
-		gauge.d \
-		gdiobj.d \
-		gsockgtk.d \
-		icon.d \
-		joystick.d \
-		listbox.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		minifram.d \
-		notebook.d \
-		pen.d \
-		popupwin.d \
-		radiobox.d \
-		radiobut.d \
-		region.d \
-		scrolbar.d \
-		scrolwin.d \
-		settings.d \
-		slider.d \
-		spinbutt.d \
-		spinctrl.d \
-		statbmp.d \
-		statbox.d \
-		statline.d \
-		stattext.d \
-		tbargtk.d \
-		textctrl.d \
-		tglbtn.d \
-		timer.d \
-		tooltip.d \
-		toplevel.d \
-		utilsgtk.d \
-		utilsres.d \
-		wave.d \
-		win_gtk.d \
-		window.d
-
 GUI_LOWLEVEL_OBJS = \
 		app.o \
 		bitmap.o \
@@ -1105,39 +871,6 @@ GUI_LOWLEVEL_OBJS = \
 		win_gtk.o \
 		window.o
 
-GUI_LOWLEVEL_DEPS = \
-		app.d \
-		bitmap.d \
-		brush.d \
-		choice.d \
-		clipbrd.d \
-		colour.d \
-		combobox.d \
-		cursor.d \
-		data.d \
-		dataobj.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcscreen.d \
-		dnd.d \
-		evtloop.d \
-		font.d \
-		gdiobj.d \
-		gsockgtk.d \
-		icon.d \
-		main.d \
-		pen.d \
-		popupwin.d \
-		region.d \
-		settings.d \
-		timer.d \
-		tooltip.d \
-		toplevel.d \
-		utilsgtk.d \
-		win_gtk.d \
-		window.d
-
 UNIXOBJS = \
 		dialup.o \
 		dir.o \
@@ -1149,17 +882,6 @@ UNIXOBJS = \
 		threadpsx.o \
 		utilsunx.o
 
-UNIXDEPS = \
-		dialup.d \
-		dir.d \
-		fontenum.d \
-		fontutil.d \
-		gsocket.d \
-		mimetype.d \
-		snglinst.d \
-		threadpsx.d \
-		utilsunx.d
-
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -1182,25 +904,3 @@ HTMLOBJS = \
 		m_tables.o \
 		winpars.o
 
-HTMLDEPS = \
-		helpctrl.d \
-		helpdata.d \
-		helpfrm.d \
-		htmlcell.d \
-		htmlfilt.d \
-		htmlpars.d \
-		htmltag.d \
-		htmlwin.d \
-		htmprint.d \
-		m_dflist.d \
-		m_fonts.d \
-		m_hline.d \
-		m_image.d \
-		m_layout.d \
-		m_links.d \
-		m_list.d \
-		m_meta.d \
-		m_pre.d \
-		m_tables.d \
-		winpars.d
-

src/gtk1/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:54, 2001/09/26
+# This file was automatically generated by tmake at 16:51, 2001/09/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -725,127 +725,6 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-COMMONDEPS = \
-		parser.d \
-		appcmn.d \
-		choiccmn.d \
-		clipcmn.d \
-		cmdline.d \
-		cmdproc.d \
-		cmndata.d \
-		config.d \
-		containr.d \
-		cshelp.d \
-		ctrlcmn.d \
-		ctrlsub.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbgrid.d \
-		dbtable.d \
-		dcbase.d \
-		dircmn.d \
-		dlgcmn.d \
-		dndcmn.d \
-		dobjcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		effects.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		fddlgcmn.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontcmn.d \
-		fontmap.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		gaugecmn.d \
-		gdicmn.d \
-		geometry.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagall.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		imagtiff.d \
-		imagxpm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		lboxcmn.d \
-		list.d \
-		log.d \
-		longlong.d \
-		matrix.d \
-		memory.d \
-		menucmn.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		nbkbase.d \
-		object.d \
-		objstrm.d \
-		paper.d \
-		popupcmn.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		quantize.d \
-		radiocmn.d \
-		regex.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		sysopt.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		toplvcmn.d \
-		treebase.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		valgen.d \
-		validate.d \
-		valtext.d \
-		variant.d \
-		wfstream.d \
-		wincmn.d \
-		wxchar.d \
-		wxexpr.d \
-		xpmdecod.d \
-		zipstrm.d \
-		zstream.d
-
 GENERICOBJS = \
 		accel.o \
 		busyinfo.o \
@@ -895,55 +774,6 @@ GENERICOBJS = \
 		treelay.o \
 		wizard.o
 
-GENERICDEPS = \
-		accel.d \
-		busyinfo.d \
-		calctrl.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirctrlg.d \
-		dirdlgg.d \
-		dragimgg.d \
-		fdrepdlg.d \
-		filedlgg.d \
-		fontdlgg.d \
-		grid.d \
-		gridctrl.d \
-		gridsel.d \
-		helpext.d \
-		helphtml.d \
-		helpwxht.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.d \
-		logg.d \
-		msgdlgg.d \
-		numdlgg.d \
-		paletteg.d \
-		panelg.d \
-		printps.d \
-		prntdlgg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrlwing.d \
-		spinctlg.d \
-		splash.d \
-		splitter.d \
-		statusbr.d \
-		tabg.d \
-		tbarsmpl.d \
-		textdlgg.d \
-		tipdlg.d \
-		tipwin.d \
-		treectlg.d \
-		treelay.d \
-		wizard.d
-
 GUIOBJS = \
 		app.o \
 		bitmap.o \
@@ -1008,70 +838,6 @@ GUIOBJS = \
 		win_gtk.o \
 		window.o
 
-GUIDEPS = \
-		app.d \
-		bitmap.d \
-		bmpbuttn.d \
-		brush.d \
-		button.d \
-		checkbox.d \
-		checklst.d \
-		choice.d \
-		clipbrd.d \
-		colour.d \
-		combobox.d \
-		control.d \
-		cursor.d \
-		data.d \
-		dataobj.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcscreen.d \
-		dialog.d \
-		dnd.d \
-		evtloop.d \
-		font.d \
-		fontdlg.d \
-		frame.d \
-		gauge.d \
-		gdiobj.d \
-		gsockgtk.d \
-		icon.d \
-		joystick.d \
-		listbox.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		minifram.d \
-		notebook.d \
-		pen.d \
-		popupwin.d \
-		radiobox.d \
-		radiobut.d \
-		region.d \
-		scrolbar.d \
-		scrolwin.d \
-		settings.d \
-		slider.d \
-		spinbutt.d \
-		spinctrl.d \
-		statbmp.d \
-		statbox.d \
-		statline.d \
-		stattext.d \
-		tbargtk.d \
-		textctrl.d \
-		tglbtn.d \
-		timer.d \
-		tooltip.d \
-		toplevel.d \
-		utilsgtk.d \
-		utilsres.d \
-		wave.d \
-		win_gtk.d \
-		window.d
-
 GUI_LOWLEVEL_OBJS = \
 		app.o \
 		bitmap.o \
@@ -1105,39 +871,6 @@ GUI_LOWLEVEL_OBJS = \
 		win_gtk.o \
 		window.o
 
-GUI_LOWLEVEL_DEPS = \
-		app.d \
-		bitmap.d \
-		brush.d \
-		choice.d \
-		clipbrd.d \
-		colour.d \
-		combobox.d \
-		cursor.d \
-		data.d \
-		dataobj.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcscreen.d \
-		dnd.d \
-		evtloop.d \
-		font.d \
-		gdiobj.d \
-		gsockgtk.d \
-		icon.d \
-		main.d \
-		pen.d \
-		popupwin.d \
-		region.d \
-		settings.d \
-		timer.d \
-		tooltip.d \
-		toplevel.d \
-		utilsgtk.d \
-		win_gtk.d \
-		window.d
-
 UNIXOBJS = \
 		dialup.o \
 		dir.o \
@@ -1149,17 +882,6 @@ UNIXOBJS = \
 		threadpsx.o \
 		utilsunx.o
 
-UNIXDEPS = \
-		dialup.d \
-		dir.d \
-		fontenum.d \
-		fontutil.d \
-		gsocket.d \
-		mimetype.d \
-		snglinst.d \
-		threadpsx.d \
-		utilsunx.d
-
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -1182,25 +904,3 @@ HTMLOBJS = \
 		m_tables.o \
 		winpars.o
 
-HTMLDEPS = \
-		helpctrl.d \
-		helpdata.d \
-		helpfrm.d \
-		htmlcell.d \
-		htmlfilt.d \
-		htmlpars.d \
-		htmltag.d \
-		htmlwin.d \
-		htmprint.d \
-		m_dflist.d \
-		m_fonts.d \
-		m_hline.d \
-		m_image.d \
-		m_layout.d \
-		m_links.d \
-		m_list.d \
-		m_meta.d \
-		m_pre.d \
-		m_tables.d \
-		winpars.d
-

src/make.env.in

@@ -1,11 +1,12 @@
 #
 # File:     make.env
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
-# Updated:  1999
+# Updated:  2001
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
+# Copyright:(c) 2001, Ron Lee
 #
 
 ####################### GENERAL SETTINGS ############################
@@ -29,13 +30,8 @@ WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
 ########################### Programs #################################
 
-# C++ compiler
+CXX         = @CXX@
-CC          = @CXX@
+CC          = @CC@
-CCPP        = @CXXCPP@
-
-# C compiler
-CCC         = @CC@
-CCCPP       = @CPP@
 
 # Compiler for lex/yacc .c programs
 CCLEX       = @CC@
@@ -57,15 +53,14 @@ SHARED_LD   = @SHARED_LD@
 
 RESFLAGS    = @RESFLAGS@
 RESCOMP     = @RESCOMP@
-REZ         = @REZ@
+
-REZFLAGS    = @REZFLAGS@
 DEREZ       = @DEREZ@
-DEREZFLAGS  = @DEREZFLAGS@
+
 DLLTOOL     = @DLLTOOL@
 
 ########################### Flags #################################
 
-CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@
+CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@ @WXDEBUG_DEFINE@
 CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
 CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \
            @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@

src/makelib.env.in

@@ -34,93 +34,88 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-TARGETLIB_STATIC = ${TARGET_LIBNAME}.a
+TARGETLIB_STATIC = $(TARGET_LIBNAME).a
-TARGETLIB_SHARED = ${TARGET_LIBNAME}.so.${LIBVERSION_CURRENT}.${LIBVERSION_REVISION}.${LIBVERSION_AGE}
+TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
-TARGETLIB_LINK1 = ${TARGET_LIBNAME}.so.${LIBVERSION_CURRENT}
+TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
-TARGETLIB_LINK2 = ${TARGET_LIBNAME}.so
+TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
 
 TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
 
-# Clears all default suffixes
+%.o : %.c
-.SUFFIXES:	.o .cpp .c .cxx
+	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
-.c.o :
+%.o : %.cpp
-	${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${PICFLAGS} -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
-.cpp.o :
+%.o : %.cxx
-	${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${PICFLAGS} -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
-
-.cxx.o :
-	${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${PICFLAGS} -o $@ $<
 
 # 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 = @PATH_IFS@${top_srcdir}/${libsrc_dir} # ':' for autoconf
+VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf
 
-include ${top_builddir}/src/make.env
+include $(top_builddir)/src/make.env
 
 
 all: libtype_@WX_TARGET_LIBRARY_TYPE@
 
-libtype_so: CREATE_LINKS
+libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
 
-libtype_a: ${TARGETLIB_STATIC}
+libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
 
 
-${TARGETLIB_SHARED}: ${OBJECTS}
+$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
-	@${INSTALL} -d ${top_builddir}/lib
+	@$(INSTALL) -d $(top_builddir)/lib
-	${SHARED_LD} ${top_builddir}/lib/$@ ${TARGETLIB_SONAME} ${OBJECTS}
+	$(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)
+	cd $(top_builddir)/lib \
+		&& $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
+		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
+		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
 
-CREATE_LINKS: ${TARGETLIB_SHARED}
+$(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS)
-	cd ${top_builddir}/lib \
+	@$(INSTALL) -d $(top_builddir)/lib
-		&& ${RM} ${TARGETLIB_LINK1} ${TARGETLIB_LINK2} \
+	ar $(AROPTIONS) $@ $(OBJECTS)
-		&& ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK1} \
+	$(RANLIB) $@
-		&& ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK2}
-
-${TARGETLIB_STATIC}: ${OBJECTS}
-	@${INSTALL} -d ${top_builddir}/lib
-	ar ${AROPTIONS} ${top_builddir}/lib/$@ ${OBJECTS}
-	${RANLIB} ${top_builddir}/lib/$@
 
 install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
 
 install_so:
-	${INSTALL_PROGRAM} ${top_builddir}/lib/${TARGETLIB_SHARED} ${libdir}/${TARGETLIB_SHARED}
+	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
-	@${RM} ${libdir}/${TARGETLIB_LINK1} ${libdir}/${TARGETLIB_LINK2}
+	@$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
-	cd ${libdir} \
+	cd $(libdir) \
-		&& ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK1} \
+		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
-		&& ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK2}
+		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
 
 install_a:
-	${INSTALL_PROGRAM} ${top_builddir}/lib/${TARGETLIB_STATIC} ${libdir}/${TARGETLIB_STATIC}
+	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
 
 install_headers:
-	${INSTALL} -d ${includedir}/wx/${HEADER_SUBDIR}
+	$(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR)
-	@for h in ${HEADERS}; do \
+	@for h in $(HEADERS); do \
-	  ${INSTALL_DATA} ${HEADER_PATH}/${HEADER_SUBDIR}/$$h ${includedir}/wx/${HEADER_SUBDIR}/$$h; \
+	  $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
-	  echo "installing ${includedir}/wx/${HEADER_SUBDIR}/$$h"; \
+	  echo "installing $(includedir)/wx/$(HEADER_SUBDIR)/$$h"; \
 	done
 
 uninstall:
-	${RM} ${libdir}/${TARGETLIB_STATIC}
+	$(RM) $(libdir)/$(TARGETLIB_STATIC)
-	${RM} ${libdir}/${TARGETLIB_SHARED}
+	$(RM) $(libdir)/$(TARGETLIB_SHARED)
-	${RM} ${libdir}/${TARGETLIB_LINK1}
+	$(RM) $(libdir)/$(TARGETLIB_LINK1)
-	${RM} ${libdir}/${TARGETLIB_LINK2}
+	$(RM) $(libdir)/$(TARGETLIB_LINK2)
 	@echo "removing headers"
-	@for h in ${HEADERS}; do \
+	@for h in $(HEADERS); do \
-	  ${RM} ${includedir}/wx/${HEADER_SUBDIR}/$$h; \
+	  $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
 	done
-	@if test -d ${includedir}/wx/${HEADER_SUBDIR}; then \
+	@if test -d $(includedir)/wx/$(HEADER_SUBDIR); then \
-	  rmdir ${includedir}/wx/${HEADER_SUBDIR}; \
+	  rmdir $(includedir)/wx/$(HEADER_SUBDIR); \
 	fi
-	@-rmdir ${includedir}/wx
+	@-rmdir $(includedir)/wx
 
 clean:
-	${RM} ${OBJECTS} ${top_builddir}/lib/${TARGETLIB_SHARED} \
+	$(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \
-	      ${top_builddir}/lib/${TARGETLIB_LINK1} \
+	      $(top_builddir)/lib/$(TARGETLIB_LINK1) \
-	      ${top_builddir}/lib/${TARGETLIB_LINK2} \
+	      $(top_builddir)/lib/$(TARGETLIB_LINK2) \
-	      ${top_builddir}/lib/${TARGETLIB_STATIC} core
+	      $(top_builddir)/lib/$(TARGETLIB_STATIC) core
 
-.PHONY: all shared static clean install install_static install_shared uninstall
+.PHONY: all libtype_so libtype_a install install_so install_a install_headers uninstall clean
 

src/makeprog.env.in

@@ -1,55 +1,50 @@
 # Make environment for making samples on Unix
 
-# Clears all default suffixes
+# The binary program extension, if any, including dots (e.g. '.exe')
-.SUFFIXES:	.o .cpp .c .cxx
-
-# The binary program extension, if any, including dots {e.g. '.exe'}
 PROGRAM_EXT = @PROGRAM_EXT@
-BIN_PROGRAM = ${PROGRAM}${PROGRAM_EXT}
+BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
-RES_PROGRAM = ${PROGRAM}_resources.o
+RES_PROGRAM_OBJ = @RESPROGRAMOBJ@
-RES_PROGRAM_OPT = @RESPROGRAM@
 
-# To add resources to the Mac OS X applications
+%.o : %.c
-LIBWX_MACRES = ${top_builddir}/lib/lib@WX_LIBRARY@-${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.r
+	$(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
-LIBWX_MACRESCOMP = ${RESCOMP} ${RESFLAGS} ${LIBWX_MACRES} -o ${BIN_PROGRAM}
 
-.c.o :
+%.o : %.cpp
-	${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${APPEXTRADEFS} -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-.cpp.o :
+%.o : %.cxx
-	${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
+
+%_resources.o : %.rc
+	$(RESCOMP) -i $< -o $@ $(RESFLAGS)
 
-.cxx.o :
-	${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<
 
 # 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 = @PATH_IFS@${top_srcdir}/${program_dir} # ':' for autoconf
+VPATH = @PATH_IFS@$(top_srcdir)/$(program_dir) # ':' for autoconf
 
 # Set defaults from configure
-include ${top_builddir}/src/make.env
+include $(top_builddir)/src/make.env
 
-all:    ${BIN_PROGRAM} install_dirs install_data
+all:    $(BIN_PROGRAM) install_dirs install_data
 
-${BIN_PROGRAM}:	${OBJECTS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${RES_PROGRAM_OPT} @LIBWXMACRES@
+$(BIN_PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@
-	${CC} ${LDFLAGS} -o ${BIN_PROGRAM} ${OBJECTS} ${LDLIBS} ${LIBRARIES} ${RES_PROGRAM_OPT}
+	$(CXX) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
 	@LIBWXMACRESCOMP@
 
-${RES_PROGRAM}:  ${PROGRAM}.rc
-	${RESCOMP} ${RCINPUTSWITCH} ${top_srcdir}/${program_dir}/${PROGRAM}.rc ${RCOUTPUTSWITCH} ${PROGRAM}_resources.o ${RESFLAGS}
 
 install_dirs:
-	@list='${DATADIRS}'; for p in $$list; do \
+	@list='$(DATADIRS)'; for p in $$list; do \
-	  mkdir -p ${top_builddir}/${program_dir}/$$p; \
+	  mkdir -p $(top_builddir)/$(program_dir)/$$p; \
 	done
 	
 install_data:
-	@list='${DATAFILES}'; for p in $$list; do \
+	@list='$(DATAFILES)'; for p in $$list; do \
-	  if test ! -s ${top_builddir}/${program_dir}/$$p; then \
+	  if test ! -s $(top_builddir)/$(program_dir)/$$p; then \
-	     cp -pRf ${top_srcdir}/${program_dir}/$$p ${top_builddir}/${program_dir}/$$p; \
+	     cp -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
 	  fi; \
 	done
 
 clean:
-	rm -f ${OBJECTS} ${BIN_PROGRAM}  ${RES_PROGRAM} core
+	rm -f $(OBJECTS) $(BIN_PROGRAM) $(RES_PROGRAM_OBJ) core
+

src/mgl/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:50, 2001/09/19
+# This file was automatically generated by tmake at 16:53, 2001/09/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -688,128 +688,6 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-COMMONDEPS = \
-		parser.d \
-		appcmn.d \
-		choiccmn.d \
-		clipcmn.d \
-		cmdline.d \
-		cmdproc.d \
-		cmndata.d \
-		config.d \
-		containr.d \
-		cshelp.d \
-		ctrlcmn.d \
-		ctrlsub.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbgrid.d \
-		dbtable.d \
-		dcbase.d \
-		dircmn.d \
-		dlgcmn.d \
-		dndcmn.d \
-		dobjcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		effects.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		fddlgcmn.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontcmn.d \
-		fontmap.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		gaugecmn.d \
-		gdicmn.d \
-		geometry.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagall.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		imagtiff.d \
-		imagxpm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		lboxcmn.d \
-		list.d \
-		log.d \
-		longlong.d \
-		matrix.d \
-		memory.d \
-		menucmn.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		nbkbase.d \
-		object.d \
-		objstrm.d \
-		odbc.d \
-		paper.d \
-		popupcmn.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		quantize.d \
-		radiocmn.d \
-		regex.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		sysopt.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		toplvcmn.d \
-		treebase.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		valgen.d \
-		validate.d \
-		valtext.d \
-		variant.d \
-		wfstream.d \
-		wincmn.d \
-		wxchar.d \
-		wxexpr.d \
-		xpmdecod.d \
-		zipstrm.d \
-		zstream.d
-
 GENERICOBJS = \
 		accel.o \
 		busyinfo.o \
@@ -858,55 +736,6 @@ GENERICOBJS = \
 		treelay.o \
 		wizard.o
 
-GENERICDEPS = \
-		accel.d \
-		busyinfo.d \
-		calctrl.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirctrlg.d \
-		dirdlgg.d \
-		dragimgg.d \
-		fdrepdlg.d \
-		filedlgg.d \
-		fontdlgg.d \
-		grid.d \
-		gridctrl.d \
-		gridsel.d \
-		helpext.d \
-		helphtml.d \
-		helpwxht.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.d \
-		logg.d \
-		msgdlgg.d \
-		numdlgg.d \
-		panelg.d \
-		printps.d \
-		prntdlgg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrlwing.d \
-		spinctlg.d \
-		splash.d \
-		splitter.d \
-		statusbr.d \
-		tabg.d \
-		tbarsmpl.d \
-		textdlgg.d \
-		tipdlg.d \
-		tipwin.d \
-		treectlg.d \
-		treelay.d \
-		wizard.d
-
-
 GUI_LOWLEVEL_OBJS = \
 		app.o \
 		bitmap.o \
@@ -933,32 +762,6 @@ GUI_LOWLEVEL_OBJS = \
 		utils.o \
 		window.o
 
-GUI_LOWLEVEL_DEPS = \
-		app.d \
-		bitmap.d \
-		bmpbase.d \
-		brush.d \
-		clipbrd.d \
-		colour.d \
-		cursor.d \
-		data.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcscreen.d \
-		evtloop.d \
-		font.d \
-		gdiobj.d \
-		icon.d \
-		palette.d \
-		pen.d \
-		region.d \
-		settings.d \
-		timer.d \
-		toplevel.d \
-		utils.d \
-		window.d
-
 UNIXOBJS = \
 		dialup.o \
 		dir.o \
@@ -970,17 +773,6 @@ UNIXOBJS = \
 		threadpsx.o \
 		utilsunx.o
 
-UNIXDEPS = \
-		dialup.d \
-		dir.d \
-		fontenum.d \
-		fontutil.d \
-		gsocket.d \
-		mimetype.d \
-		snglinst.d \
-		threadpsx.d \
-		utilsunx.d
-
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -1003,25 +795,3 @@ HTMLOBJS = \
 		m_tables.o \
 		winpars.o
 
-HTMLDEPS = \
-		helpctrl.d \
-		helpdata.d \
-		helpfrm.d \
-		htmlcell.d \
-		htmlfilt.d \
-		htmlpars.d \
-		htmltag.d \
-		htmlwin.d \
-		htmprint.d \
-		m_dflist.d \
-		m_fonts.d \
-		m_hline.d \
-		m_image.d \
-		m_layout.d \
-		m_links.d \
-		m_list.d \
-		m_meta.d \
-		m_pre.d \
-		m_tables.d \
-		winpars.d
-

src/motif/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:54, 2001/09/26
+# This file was automatically generated by tmake at 16:55, 2001/09/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -712,127 +712,6 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-COMMONDEPS = \
-		parser.d \
-		appcmn.d \
-		choiccmn.d \
-		clipcmn.d \
-		cmdline.d \
-		cmdproc.d \
-		cmndata.d \
-		config.d \
-		containr.d \
-		cshelp.d \
-		ctrlcmn.d \
-		ctrlsub.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbgrid.d \
-		dbtable.d \
-		dcbase.d \
-		dircmn.d \
-		dlgcmn.d \
-		dndcmn.d \
-		dobjcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		effects.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		fddlgcmn.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontcmn.d \
-		fontmap.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		gaugecmn.d \
-		gdicmn.d \
-		geometry.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagall.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		imagtiff.d \
-		imagxpm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		lboxcmn.d \
-		list.d \
-		log.d \
-		longlong.d \
-		matrix.d \
-		memory.d \
-		menucmn.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		nbkbase.d \
-		object.d \
-		objstrm.d \
-		paper.d \
-		popupcmn.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		quantize.d \
-		radiocmn.d \
-		regex.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		sysopt.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		toplvcmn.d \
-		treebase.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		valgen.d \
-		validate.d \
-		valtext.d \
-		variant.d \
-		wfstream.d \
-		wincmn.d \
-		wxchar.d \
-		wxexpr.d \
-		xpmdecod.d \
-		zipstrm.d \
-		zstream.d
-
 GENERICOBJS = \
 		busyinfo.o \
 		calctrl.o \
@@ -881,54 +760,6 @@ GENERICOBJS = \
 		treelay.o \
 		wizard.o
 
-GENERICDEPS = \
-		busyinfo.d \
-		calctrl.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirctrlg.d \
-		dirdlgg.d \
-		dragimgg.d \
-		fdrepdlg.d \
-		fontdlgg.d \
-		grid.d \
-		gridctrl.d \
-		gridsel.d \
-		helpext.d \
-		helphtml.d \
-		helpwxht.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.d \
-		logg.d \
-		msgdlgg.d \
-		notebook.d \
-		numdlgg.d \
-		panelg.d \
-		printps.d \
-		prntdlgg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrlwing.d \
-		spinctlg.d \
-		splash.d \
-		splitter.d \
-		statline.d \
-		statusbr.d \
-		tabg.d \
-		tbarsmpl.d \
-		textdlgg.d \
-		tipdlg.d \
-		tipwin.d \
-		treectlg.d \
-		treelay.d \
-		wizard.d
-
 GUIOBJS = \
 		xmcombo.o \
 		accel.o \
@@ -985,61 +816,6 @@ GUIOBJS = \
 		utils.o \
 		window.o
 
-GUIDEPS = \
-		accel.d \
-		app.d \
-		bitmap.d \
-		bmpbuttn.d \
-		brush.d \
-		button.d \
-		checkbox.d \
-		checklst.d \
-		choice.d \
-		clipbrd.d \
-		colour.d \
-		combobox.d \
-		control.d \
-		cursor.d \
-		data.d \
-		dataobj.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcscreen.d \
-		dialog.d \
-		filedlg.d \
-		font.d \
-		frame.d \
-		gauge.d \
-		gdiobj.d \
-		glcanvas.d \
-		gsockmot.d \
-		icon.d \
-		listbox.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		menuitem.d \
-		minifram.d \
-		msgdlg.d \
-		palette.d \
-		pen.d \
-		radiobox.d \
-		radiobut.d \
-		region.d \
-		scrolbar.d \
-		settings.d \
-		slider.d \
-		spinbutt.d \
-		statbmp.d \
-		statbox.d \
-		stattext.d \
-		textctrl.d \
-		timer.d \
-		toolbar.d \
-		utils.d \
-		window.d
-
 UNIXOBJS = \
 		dialup.o \
 		dir.o \
@@ -1051,17 +827,6 @@ UNIXOBJS = \
 		threadpsx.o \
 		utilsunx.o
 
-UNIXDEPS = \
-		dialup.d \
-		dir.d \
-		fontenum.d \
-		fontutil.d \
-		gsocket.d \
-		mimetype.d \
-		snglinst.d \
-		threadpsx.d \
-		utilsunx.d
-
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -1084,24 +849,3 @@ HTMLOBJS = \
 		m_tables.o \
 		winpars.o
 
-HTMLDEPS = \
-		helpctrl.d \
-		helpdata.d \
-		helpfrm.d \
-		htmlcell.d \
-		htmlfilt.d \
-		htmlpars.d \
-		htmltag.d \
-		htmlwin.d \
-		htmprint.d \
-		m_dflist.d \
-		m_fonts.d \
-		m_hline.d \
-		m_image.d \
-		m_layout.d \
-		m_links.d \
-		m_list.d \
-		m_meta.d \
-		m_pre.d \
-		m_tables.d \
-		winpars.d

src/msw/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:54, 2001/09/26
+# This file was automatically generated by tmake at 04:14, 2001/09/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -772,127 +772,6 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-COMMONDEPS = \
-		parser.d \
-		appcmn.d \
-		choiccmn.d \
-		clipcmn.d \
-		cmdline.d \
-		cmdproc.d \
-		cmndata.d \
-		config.d \
-		containr.d \
-		cshelp.d \
-		ctrlcmn.d \
-		ctrlsub.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbgrid.d \
-		dbtable.d \
-		dcbase.d \
-		dircmn.d \
-		dlgcmn.d \
-		dndcmn.d \
-		dobjcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		effects.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		fddlgcmn.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontcmn.d \
-		fontmap.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		gaugecmn.d \
-		gdicmn.d \
-		geometry.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagall.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		imagtiff.d \
-		imagxpm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		lboxcmn.d \
-		list.d \
-		log.d \
-		longlong.d \
-		matrix.d \
-		memory.d \
-		menucmn.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		nbkbase.d \
-		object.d \
-		objstrm.d \
-		paper.d \
-		popupcmn.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		quantize.d \
-		radiocmn.d \
-		regex.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		sysopt.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		toplvcmn.d \
-		treebase.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		valgen.d \
-		validate.d \
-		valtext.d \
-		variant.d \
-		wfstream.d \
-		wincmn.d \
-		wxchar.d \
-		wxexpr.d \
-		xpmdecod.d \
-		zipstrm.d \
-		zstream.d
-
 GENERICOBJS = \
 		busyinfo.o \
 		calctrl.o \
@@ -924,37 +803,6 @@ GENERICOBJS = \
 		treelay.o \
 		wizard.o
 
-GENERICDEPS = \
-		busyinfo.d \
-		calctrl.d \
-		choicdgg.d \
-		dirctrlg.d \
-		dragimgg.d \
-		grid.d \
-		gridctrl.d \
-		gridsel.d \
-		laywin.d \
-		logg.d \
-		numdlgg.d \
-		panelg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrlwing.d \
-		spinctlg.d \
-		splash.d \
-		splitter.d \
-		statusbr.d \
-		tbarsmpl.d \
-		textdlgg.d \
-		tipdlg.d \
-		tipwin.d \
-		treectlg.d \
-		treelay.d \
-		wizard.d
-
 GUIOBJS = \
 		accel.o \
 		app.o \
@@ -1057,112 +905,6 @@ GUIOBJS = \
 		wave.o \
 		window.o
 
-GUIDEPS = \
-		accel.d \
-		app.d \
-		bitmap.d \
-		bmpbuttn.d \
-		brush.d \
-		button.d \
-		caret.d \
-		checkbox.d \
-		checklst.d \
-		choice.d \
-		clipbrd.d \
-		colordlg.d \
-		colour.d \
-		combobox.d \
-		control.d \
-		curico.d \
-		cursor.d \
-		data.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcprint.d \
-		dcscreen.d \
-		dde.d \
-		dialog.d \
-		dialup.d \
-		dib.d \
-		dibutils.d \
-		dir.d \
-		dirdlg.d \
-		dragimag.d \
-		enhmeta.d \
-		evtloop.d \
-		fdrepdlg.d \
-		filedlg.d \
-		font.d \
-		fontdlg.d \
-		fontenum.d \
-		fontutil.d \
-		frame.d \
-		gauge95.d \
-		gdiimage.d \
-		gdiobj.d \
-		glcanvas.d \
-		gsocket.d \
-		gsockmsw.d \
-		helpbest.d \
-		helpchm.d \
-		helpwin.d \
-		icon.d \
-		imaglist.d \
-		joystick.d \
-		listbox.d \
-		listctrl.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		menuitem.d \
-		metafile.d \
-		mimetype.d \
-		minifram.d \
-		msgdlg.d \
-		nativdlg.d \
-		notebook.d \
-		ownerdrw.d \
-		palette.d \
-		pen.d \
-		penwin.d \
-		printdlg.d \
-		printwin.d \
-		radiobox.d \
-		radiobut.d \
-		regconf.d \
-		region.d \
-		registry.d \
-		scrolbar.d \
-		settings.d \
-		slider95.d \
-		snglinst.d \
-		spinbutt.d \
-		spinctrl.d \
-		statbmp.d \
-		statbox.d \
-		statbr95.d \
-		statline.d \
-		stattext.d \
-		tabctrl.d \
-		taskbar.d \
-		tbar95.d \
-		textctrl.d \
-		tglbtn.d \
-		thread.d \
-		timer.d \
-		tooltip.d \
-		toplevel.d \
-		treectrl.d \
-		utils.d \
-		utilsexc.d \
-		wave.d \
-		window.d
-
-UNIXOBJS = \
-
-UNIXDEPS = \
-
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -1185,28 +927,6 @@ HTMLOBJS = \
 		m_tables.o \
 		winpars.o
 
-HTMLDEPS = \
-		helpctrl.d \
-		helpdata.d \
-		helpfrm.d \
-		htmlcell.d \
-		htmlfilt.d \
-		htmlpars.d \
-		htmltag.d \
-		htmlwin.d \
-		htmprint.d \
-		m_dflist.d \
-		m_fonts.d \
-		m_hline.d \
-		m_image.d \
-		m_layout.d \
-		m_links.d \
-		m_list.d \
-		m_meta.d \
-		m_pre.d \
-		m_tables.d \
-		winpars.d
-
 OLEOBJS = \
 		automtn.o \
 		dataobj.o \
@@ -1215,14 +935,3 @@ OLEOBJS = \
 		oleutils.o \
 		uuid.o
 
-OLEDEPS = \
-		automtn.d \
-		dataobj.d \
-		dropsrc.d \
-		droptgt.d \
-		oleutils.d \
-		uuid.d
-
-IODBCOBJS = \
-
-IODBCDEPS = \

src/msw/gsocket.c

@@ -1378,6 +1378,6 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
  * Translation unit shouldn't be empty, so include this typedef to make the
  * compiler (VC++ 6.0, for example) happy
  */
-typedef (*wxDummy)();
+typedef void (*wxDummy)();
 
 #endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */

src/msw/gsockmsw.c

@@ -283,6 +283,6 @@ void _GSocket_Disable_Events(GSocket *socket)
  * Translation unit shouldn't be empty, so include this typedef to make the
  * compiler (VC++ 6.0, for example) happy
  */
-typedef (*wxDummy)();
+typedef void (*wxDummy)();
 
 #endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */

src/msw/toplevel.cpp

@@ -29,6 +29,8 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/toplevel.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"

src/msw/utils.cpp

@@ -31,9 +31,11 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/cursor.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+#if wxUSE_GUI
+    #include "wx/cursor.h"
+#endif
 #endif  //WX_PRECOMP
 
 // In some mingws there is a missing extern "C" int the winsock header,

src/os2/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:54, 2001/09/26
+# This file was automatically generated by tmake at 16:58, 2001/09/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -730,127 +730,6 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-COMMONDEPS = \
-		parser.d \
-		appcmn.d \
-		choiccmn.d \
-		clipcmn.d \
-		cmdline.d \
-		cmdproc.d \
-		cmndata.d \
-		config.d \
-		containr.d \
-		cshelp.d \
-		ctrlcmn.d \
-		ctrlsub.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbgrid.d \
-		dbtable.d \
-		dcbase.d \
-		dircmn.d \
-		dlgcmn.d \
-		dndcmn.d \
-		dobjcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		effects.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		fddlgcmn.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontcmn.d \
-		fontmap.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		gaugecmn.d \
-		gdicmn.d \
-		geometry.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagall.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		imagtiff.d \
-		imagxpm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		lboxcmn.d \
-		list.d \
-		log.d \
-		longlong.d \
-		matrix.d \
-		memory.d \
-		menucmn.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		nbkbase.d \
-		object.d \
-		objstrm.d \
-		paper.d \
-		popupcmn.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		quantize.d \
-		radiocmn.d \
-		regex.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		sysopt.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		toplvcmn.d \
-		treebase.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		valgen.d \
-		validate.d \
-		valtext.d \
-		variant.d \
-		wfstream.d \
-		wincmn.d \
-		wxchar.d \
-		wxexpr.d \
-		xpmdecod.d \
-		zipstrm.d \
-		zstream.d
-
 GENERICOBJS = \
 		busyinfo.o \
 		calctrl.o \
@@ -893,48 +772,6 @@ GENERICOBJS = \
 		treelay.o \
 		wizard.o
 
-GENERICDEPS = \
-		busyinfo.d \
-		calctrl.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirctrlg.d \
-		fdrepdlg.d \
-		grid.d \
-		gridctrl.d \
-		gridsel.d \
-		helpext.d \
-		helphtml.d \
-		helpwxht.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.d \
-		logg.d \
-		msgdlgg.d \
-		numdlgg.d \
-		panelg.d \
-		printps.d \
-		prntdlgg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrlwing.d \
-		spinctlg.d \
-		splash.d \
-		splitter.d \
-		statusbr.d \
-		tbarsmpl.d \
-		textdlgg.d \
-		tipdlg.d \
-		tipwin.d \
-		treectlg.d \
-		treelay.d \
-		wizard.d
-
 GUIOBJS = \
 		accel.o \
 		app.o \
@@ -1015,90 +852,8 @@ GUIOBJS = \
 		wave.o \
 		window.o
 
-GUIDEPS = \
-		accel.d \
-		app.d \
-		bitmap.d \
-		bmpbuttn.d \
-		brush.d \
-		button.d \
-		checkbox.d \
-		checklst.d \
-		choice.d \
-		clipbrd.d \
-		colour.d \
-		combobox.d \
-		control.d \
-		cursor.d \
-		data.d \
-		dataobj.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcprint.d \
-		dcscreen.d \
-		dialog.d \
-		dir.d \
-		dirdlg.d \
-		dnd.d \
-		filedlg.d \
-		font.d \
-		fontdlg.d \
-		fontenum.d \
-		fontutil.d \
-		frame.d \
-		gauge.d \
-		gdiimage.d \
-		gdiobj.d \
-		gsocket.d \
-		gsockpm.d \
-		helpwin.d \
-		icon.d \
-		iniconf.d \
-		joystick.d \
-		listbox.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		menuitem.d \
-		metafile.d \
-		mimetype.d \
-		minifram.d \
-		msgdlg.d \
-		nativdlg.d \
-		notebook.d \
-		ownerdrw.d \
-		palette.d \
-		pen.d \
-		print.d \
-		radiobox.d \
-		radiobut.d \
-		region.d \
-		scrolbar.d \
-		settings.d \
-		slider.d \
-		spinbutt.d \
-		spinctrl.d \
-		statbmp.d \
-		statbox.d \
-		statline.d \
-		stattext.d \
-		tabctrl.d \
-		taskbar.d \
-		textctrl.d \
-		thread.d \
-		timer.d \
-		toolbar.d \
-		tooltip.d \
-		utils.d \
-		utilsexc.d \
-		wave.d \
-		window.d
-
 UNIXOBJS = \
 
-UNIXDEPS = \
-
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -1121,25 +876,3 @@ HTMLOBJS = \
 		m_tables.o \
 		winpars.o
 
-HTMLDEPS = \
-		helpctrl.d \
-		helpdata.d \
-		helpfrm.d \
-		htmlcell.d \
-		htmlfilt.d \
-		htmlpars.d \
-		htmltag.d \
-		htmlwin.d \
-		htmprint.d \
-		m_dflist.d \
-		m_fonts.d \
-		m_hline.d \
-		m_image.d \
-		m_layout.d \
-		m_links.d \
-		m_list.d \
-		m_meta.d \
-		m_pre.d \
-		m_tables.d \
-		winpars.d
-

src/univ/files.lst

@@ -1,5 +1,5 @@
-# This file was automatically generated by tmake at 14:54, 2001/09/26
+# This file was automatically generated by tmake at 11:01, 2001/09/25
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
 UNIVOBJS = \
 		bmpbuttn.o \
 		button.o \
@@ -34,37 +34,3 @@ UNIVOBJS = \
 		win32.o \
 		winuniv.o
 
-UNIVDEPS = \
-		bmpbuttn.d \
-		button.d \
-		checkbox.d \
-		checklst.d \
-		colschem.d \
-		control.d \
-		dialog.d \
-		framuniv.d \
-		gauge.d \
-		gtk.d \
-		inpcons.d \
-		inphand.d \
-		listbox.d \
-		menu.d \
-		notebook.d \
-		radiobox.d \
-		radiobut.d \
-		renderer.d \
-		scrarrow.d \
-		scrolbar.d \
-		scrthumb.d \
-		slider.d \
-		spinbutt.d \
-		statbmp.d \
-		statbox.d \
-		statline.d \
-		stattext.d \
-		textctrl.d \
-		theme.d \
-		topluniv.d \
-		win32.d \
-		winuniv.d
-

wx-config.in

@@ -6,12 +6,13 @@ exec_prefix_set=no
 CC="@CC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
+cross_compiling=@cross_compiling@
 
 usage()
 {
     cat <<EOF
 Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
-                 [--libs] [--cppflags] [--cflags] [--cxxflags]
+                 [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags]
                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed
@@ -26,17 +27,18 @@ EOF
 
 cppflags()
 {
-    if test @includedir@ != /usr/include ; then
+    if test "${cross_compiling}" != "yes" \
-        if test @includedir@ != /usr/include/c++ ; then
+            -a @includedir@ != /usr/include \
-            includes=-I@includedir@
+            -a @includedir@ != /usr/include/c++ ;
-        fi
+    then
+        includes=-I@includedir@
     fi
-    includes="$includes -I@libdir@/wx/include -D__USE_WXCONFIG__"
+    includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
-    echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@
+    echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
 }
 
 if test $# -eq 0; then
-      usage 1 1>&2
+    usage 1 1>&2
 fi
 
 while test $# -gt 0; do
@@ -75,10 +77,15 @@ while test $# -gt 0; do
       echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
       ;;
     --libs)
-      if test @libdir@ != /usr/lib ; then
+      if test "${cross_compiling}" != "yes" \
-        libs="-L@libdir@"
+              -a @libdir@ != /usr/lib ;
+      then
+          libs="-L@libdir@"
       fi
-      echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@
+      echo $libs @WXCONFIG_LIBS@ @EXTRA_LIBS@
+      ;;
+    --gl-libs)
+      echo @WXCONFIG_LIBS_GL@
       ;;
     --cc)
       echo $CC

wxBase.spec

@@ -33,7 +33,7 @@ Header files for wxBase. You need them to develop programs using wxBase.
 
 %prep
 %setup -n wxBase-%{ver}
-./configure --prefix=%{pref} --disable-gui --disable-std_iostreams
+./configure --prefix=%{pref} --enable-soname --disable-gui --disable-std_iostreams
 
 %build
 if [ "$SMP" != "" ]; then

wxGTK.spec

@@ -47,7 +47,7 @@ OpenGl add-on library for wxGTK, the GTK+ 1.2 port of the wxWindows library.
 
 %prep
 %setup -n wxGTK-%{ver}
-./configure --prefix=%{pref} --enable-burnt_name --with-odbc --with-opengl
+./configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl
 
 %build
 if [ "$SMP" != "" ]; then

wxMotif.spec

@@ -45,7 +45,7 @@ OpenGl add-on library for wxMotif, the Motif/Lesstif port of the wxWindows libra
 
 %prep
 %setup -n wxMotif
-./configure --prefix=%{pref} --enable-burnt_name --with-odbc --with-opengl --with-motif
+./configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl --with-motif
 
 %build
 if [ "$SMP" != "" ]; then

wxPython/setup.py

@@ -415,10 +415,8 @@ if BUILD_GLCANVAS or GL_ONLY:
 
     gl_libs = []
     if os.name == 'posix':
-        if '-D__WXDEBUG__' in cflags:
+        gl_libs = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
-            gl_libs = ['wx_gtkd_gl', 'GL', 'GLU']
+        gl_libs = string.split(gl_libs)
-        else:
-            gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
     else:
         other_sources = [opj(location, 'msw/myglcanvas.cpp')]
         gl_libs = ['opengl32', 'glu32']
@@ -431,10 +429,10 @@ if BUILD_GLCANVAS or GL_ONLY:
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + gl_libs,
+                    libraries = libs,
 
                     extra_compile_args = cflags,
-                    extra_link_args = lflags,
+                    extra_link_args = gl_libs + lflags,
                     )
 
     wxpExtensions.append(ext)