Tidy up includes and #if wxUSE statements.

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3d3d2c4cd10fc9b3fff99a4e2abe698223fd19fd..16ddf54e76d6ae99759226cf48e5e4dd1b010fc4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,6 +259,7 @@ ALL_BASE_HEADERS =  \
        wx/filesys.h \
        wx/fontenc.h \
        wx/fontmap.h \
+       wx/fs_filter.h \
        wx/fs_mem.h \
        wx/fs_zip.h \
        wx/hash.h \
@@ -307,6 +308,7 @@ ALL_BASE_HEADERS =  \
        wx/stream.h \
        wx/string.h \
        wx/sysopt.h \
+       wx/tarstrm.h \
        wx/textbuf.h \
        wx/textfile.h \
        wx/thread.h \
@@ -391,6 +393,7 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/filesys.h \
        wx/fontenc.h \
        wx/fontmap.h \
+       wx/fs_filter.h \
        wx/fs_mem.h \
        wx/fs_zip.h \
        wx/hash.h \
@@ -439,6 +442,7 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/stream.h \
        wx/string.h \
        wx/sysopt.h \
+       wx/tarstrm.h \
        wx/textbuf.h \
        wx/textfile.h \
        wx/thread.h \
@@ -521,6 +525,8 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/dbtable.h
 ALL_BASE_SOURCES =  \
        src/common/appbase.cpp \
+       src/common/arcall.cpp \
+       src/common/arcfind.cpp \
        src/common/archive.cpp \
        src/common/clntdata.cpp \
        src/common/cmdline.cpp \
@@ -541,7 +547,10 @@ ALL_BASE_SOURCES =  \
        src/common/filefn.cpp \
        src/common/filename.cpp \
        src/common/filesys.cpp \
+       src/common/filtall.cpp \
+       src/common/filtfind.cpp \
        src/common/fmapbase.cpp \
+       src/common/fs_filter.cpp \
        src/common/fs_zip.cpp \
        src/common/hash.cpp \
        src/common/hashmap.cpp \
@@ -567,6 +576,7 @@ ALL_BASE_SOURCES =  \
        src/common/stream.cpp \
        src/common/string.cpp \
        src/common/sysopt.cpp \
+       src/common/tarstrm.cpp \
        src/common/textbuf.cpp \
        src/common/textfile.cpp \
        src/common/tokenzr.cpp \
@@ -670,6 +680,8 @@ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
 MONODLL_OBJECTS =  \
        $(__monodll___win32rc) \
        monodll_appbase.o \
+       monodll_arcall.o \
+       monodll_arcfind.o \
        monodll_archive.o \
        monodll_clntdata.o \
        monodll_cmdline.o \
@@ -690,7 +702,10 @@ MONODLL_OBJECTS =  \
        monodll_filefn.o \
        monodll_filename.o \
        monodll_filesys.o \
+       monodll_filtall.o \
+       monodll_filtfind.o \
        monodll_fmapbase.o \
+       monodll_fs_filter.o \
        monodll_fs_zip.o \
        monodll_hash.o \
        monodll_hashmap.o \
@@ -716,6 +731,7 @@ MONODLL_OBJECTS =  \
        monodll_stream.o \
        monodll_string.o \
        monodll_sysopt.o \
+       monodll_tarstrm.o \
        monodll_textbuf.o \
        monodll_textfile.o \
        monodll_tokenzr.o \
@@ -763,6 +779,8 @@ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
        -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        monolib_appbase.o \
+       monolib_arcall.o \
+       monolib_arcfind.o \
        monolib_archive.o \
        monolib_clntdata.o \
        monolib_cmdline.o \
@@ -783,7 +801,10 @@ MONOLIB_OBJECTS =  \
        monolib_filefn.o \
        monolib_filename.o \
        monolib_filesys.o \
+       monolib_filtall.o \
+       monolib_filtfind.o \
        monolib_fmapbase.o \
+       monolib_fs_filter.o \
        monolib_fs_zip.o \
        monolib_hash.o \
        monolib_hashmap.o \
@@ -809,6 +830,7 @@ MONOLIB_OBJECTS =  \
        monolib_stream.o \
        monolib_string.o \
        monolib_sysopt.o \
+       monolib_tarstrm.o \
        monolib_textbuf.o \
        monolib_textfile.o \
        monolib_tokenzr.o \
@@ -858,6 +880,8 @@ BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
 BASEDLL_OBJECTS =  \
        $(__basedll___win32rc) \
        basedll_appbase.o \
+       basedll_arcall.o \
+       basedll_arcfind.o \
        basedll_archive.o \
        basedll_clntdata.o \
        basedll_cmdline.o \
@@ -878,7 +902,10 @@ BASEDLL_OBJECTS =  \
        basedll_filefn.o \
        basedll_filename.o \
        basedll_filesys.o \
+       basedll_filtall.o \
+       basedll_filtfind.o \
        basedll_fmapbase.o \
+       basedll_fs_filter.o \
        basedll_fs_zip.o \
        basedll_hash.o \
        basedll_hashmap.o \
@@ -904,6 +931,7 @@ BASEDLL_OBJECTS =  \
        basedll_stream.o \
        basedll_string.o \
        basedll_sysopt.o \
+       basedll_tarstrm.o \
        basedll_textbuf.o \
        basedll_textfile.o \
        basedll_tokenzr.o \
@@ -936,6 +964,8 @@ BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
        -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        baselib_appbase.o \
+       baselib_arcall.o \
+       baselib_arcfind.o \
        baselib_archive.o \
        baselib_clntdata.o \
        baselib_cmdline.o \
@@ -956,7 +986,10 @@ BASELIB_OBJECTS =  \
        baselib_filefn.o \
        baselib_filename.o \
        baselib_filesys.o \
+       baselib_filtall.o \
+       baselib_filtfind.o \
        baselib_fmapbase.o \
+       baselib_fs_filter.o \
        baselib_fs_zip.o \
        baselib_hash.o \
        baselib_hashmap.o \
@@ -982,6 +1015,7 @@ BASELIB_OBJECTS =  \
        baselib_stream.o \
        baselib_string.o \
        baselib_sysopt.o \
+       baselib_tarstrm.o \
        baselib_textbuf.o \
        baselib_textfile.o \
        baselib_tokenzr.o \
@@ -1422,7 +1456,8 @@ RICHTEXTDLL_OBJECTS =  \
        richtextdll_richtexthtml.o \
        richtextdll_richtextformatdlg.o \
        richtextdll_richtextsymboldlg.o \
-       richtextdll_richtextstyledlg.o
+       richtextdll_richtextstyledlg.o \
+       richtextdll_richtextprint.o
 RICHTEXTDLL_ODEP =  $(___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
 RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1437,7 +1472,8 @@ RICHTEXTLIB_OBJECTS =  \
        richtextlib_richtexthtml.o \
        richtextlib_richtextformatdlg.o \
        richtextlib_richtextsymboldlg.o \
-       richtextlib_richtextstyledlg.o
+       richtextlib_richtextstyledlg.o \
+       richtextlib_richtextprint.o
 RICHTEXTLIB_ODEP =  $(___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
 GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -2811,7 +2847,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/generic/buttonbar.h \
        wx/generic/choicdgg.h \
        wx/generic/clrpickerg.h \
-       wx/generic/colpaneg.h \
+       wx/generic/collpaneg.h \
        wx/generic/colrdlgg.h \
        wx/generic/combo.h \
        wx/generic/dcpsg.h \
@@ -3059,7 +3095,8 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/richtext/richtextxml.h \
        wx/richtext/richtextformatdlg.h \
        wx/richtext/richtextsymboldlg.h \
-       wx/richtext/richtextstyledlg.h
+       wx/richtext/richtextstyledlg.h \
+       wx/richtext/richtextprint.h
 @COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS)
 COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@@ -3364,7 +3401,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        monodll_richtexthtml.o \
        monodll_richtextformatdlg.o \
        monodll_richtextsymboldlg.o \
-       monodll_richtextstyledlg.o
+       monodll_richtextstyledlg.o \
+       monodll_richtextprint.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        $(__LOWLEVEL_SRC_OBJECTS) \
@@ -3390,6 +3428,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        monodll_datacmn.o \
        monodll_dcbase.o \
        monodll_dcbufcmn.o \
+       monodll_dcgraph.o \
        monodll_dlgcmn.o \
        monodll_dndcmn.o \
        monodll_dobjcmn.o \
@@ -3560,6 +3599,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_datacmn.o \
        monodll_dcbase.o \
        monodll_dcbufcmn.o \
+       monodll_dcgraph.o \
        monodll_dlgcmn.o \
        monodll_dndcmn.o \
        monodll_dobjcmn.o \
@@ -5113,7 +5153,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        monolib_richtexthtml.o \
        monolib_richtextformatdlg.o \
        monolib_richtextsymboldlg.o \
-       monolib_richtextstyledlg.o
+       monolib_richtextstyledlg.o \
+       monolib_richtextprint.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        $(__LOWLEVEL_SRC_OBJECTS_2) \
@@ -5139,6 +5180,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_datacmn.o \
        monolib_dcbase.o \
        monolib_dcbufcmn.o \
+       monolib_dcgraph.o \
        monolib_dlgcmn.o \
        monolib_dndcmn.o \
        monolib_dobjcmn.o \
@@ -5309,6 +5351,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_datacmn.o \
        monolib_dcbase.o \
        monolib_dcbufcmn.o \
+       monolib_dcgraph.o \
        monolib_dlgcmn.o \
        monolib_dndcmn.o \
        monolib_dobjcmn.o \
@@ -7101,6 +7144,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        coredll_datacmn.o \
        coredll_dcbase.o \
        coredll_dcbufcmn.o \
+       coredll_dcgraph.o \
        coredll_dlgcmn.o \
        coredll_dndcmn.o \
        coredll_dobjcmn.o \
@@ -7271,6 +7315,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_datacmn.o \
        coredll_dcbase.o \
        coredll_dcbufcmn.o \
+       coredll_dcgraph.o \
        coredll_dlgcmn.o \
        coredll_dndcmn.o \
        coredll_dobjcmn.o \
@@ -8533,6 +8578,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        corelib_datacmn.o \
        corelib_dcbase.o \
        corelib_dcbufcmn.o \
+       corelib_dcgraph.o \
        corelib_dlgcmn.o \
        corelib_dndcmn.o \
        corelib_dobjcmn.o \
@@ -8703,6 +8749,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_datacmn.o \
        corelib_dcbase.o \
        corelib_dcbufcmn.o \
+       corelib_dcgraph.o \
        corelib_dlgcmn.o \
        corelib_dndcmn.o \
        corelib_dobjcmn.o \
@@ -12103,6 +12150,12 @@ monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
 monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
 
+monodll_arcall.o: $(srcdir)/src/common/arcall.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
+
+monodll_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
+
 monodll_archive.o: $(srcdir)/src/common/archive.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp
 
@@ -12163,9 +12216,18 @@ monodll_filename.o: $(srcdir)/src/common/filename.cpp $(MONODLL_ODEP)
 monodll_filesys.o: $(srcdir)/src/common/filesys.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filesys.cpp
 
+monodll_filtall.o: $(srcdir)/src/common/filtall.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filtall.cpp
+
+monodll_filtfind.o: $(srcdir)/src/common/filtfind.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filtfind.cpp
+
 monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fmapbase.cpp
 
+monodll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
+
 monodll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp
 
@@ -12241,6 +12303,9 @@ monodll_string.o: $(srcdir)/src/common/string.cpp $(MONODLL_ODEP)
 monodll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
 
+monodll_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp
+
 monodll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp
 
@@ -12868,6 +12933,9 @@ monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONO
 monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
 
+monodll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+
 monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
 
@@ -15646,6 +15714,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
 
+@COND_USE_GUI_1@monodll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+
 @COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
 
@@ -16171,6 +16242,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
 
+monolib_arcall.o: $(srcdir)/src/common/arcall.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
+
+monolib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
+
 monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp
 
@@ -16231,9 +16308,18 @@ monolib_filename.o: $(srcdir)/src/common/filename.cpp $(MONOLIB_ODEP)
 monolib_filesys.o: $(srcdir)/src/common/filesys.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filesys.cpp
 
+monolib_filtall.o: $(srcdir)/src/common/filtall.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filtall.cpp
+
+monolib_filtfind.o: $(srcdir)/src/common/filtfind.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filtfind.cpp
+
 monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fmapbase.cpp
 
+monolib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
+
 monolib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp
 
@@ -16309,6 +16395,9 @@ monolib_string.o: $(srcdir)/src/common/string.cpp $(MONOLIB_ODEP)
 monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
 
+monolib_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp
+
 monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp
 
@@ -16936,6 +17025,9 @@ monolib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONO
 monolib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
 
+monolib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+
 monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
 
@@ -19714,6 +19806,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
 
+@COND_USE_GUI_1@monolib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+
 @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
 
@@ -20242,6 +20337,12 @@ basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
 
+basedll_arcall.o: $(srcdir)/src/common/arcall.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
+
+basedll_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
+
 basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp
 
@@ -20302,9 +20403,18 @@ basedll_filename.o: $(srcdir)/src/common/filename.cpp $(BASEDLL_ODEP)
 basedll_filesys.o: $(srcdir)/src/common/filesys.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filesys.cpp
 
+basedll_filtall.o: $(srcdir)/src/common/filtall.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filtall.cpp
+
+basedll_filtfind.o: $(srcdir)/src/common/filtfind.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/filtfind.cpp
+
 basedll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fmapbase.cpp
 
+basedll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
+
 basedll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp
 
@@ -20380,6 +20490,9 @@ basedll_string.o: $(srcdir)/src/common/string.cpp $(BASEDLL_ODEP)
 basedll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
 
+basedll_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp
+
 basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp
 
@@ -20809,6 +20922,12 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
 
+baselib_arcall.o: $(srcdir)/src/common/arcall.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arcall.cpp
+
+baselib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp
+
 baselib_archive.o: $(srcdir)/src/common/archive.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp
 
@@ -20869,9 +20988,18 @@ baselib_filename.o: $(srcdir)/src/common/filename.cpp $(BASELIB_ODEP)
 baselib_filesys.o: $(srcdir)/src/common/filesys.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/filesys.cpp
 
+baselib_filtall.o: $(srcdir)/src/common/filtall.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/filtall.cpp
+
+baselib_filtfind.o: $(srcdir)/src/common/filtfind.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/filtfind.cpp
+
 baselib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fmapbase.cpp
 
+baselib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
+
 baselib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp
 
@@ -20947,6 +21075,9 @@ baselib_string.o: $(srcdir)/src/common/string.cpp $(BASELIB_ODEP)
 baselib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
 
+baselib_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp
+
 baselib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp
 
@@ -24115,6 +24246,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
 
+@COND_USE_GUI_1@coredll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+
 @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
 
@@ -27034,6 +27168,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
 
+@COND_USE_GUI_1@corelib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+
 @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
 
@@ -28453,6 +28590,9 @@ richtextdll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(
 richtextdll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTDLL_ODEP)
        $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
 
+richtextdll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTDLL_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+
 richtextlib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTLIB_ODEP)
        $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
 
@@ -28477,6 +28617,9 @@ richtextlib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(
 richtextlib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTLIB_ODEP)
        $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
 
+richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTLIB_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+
 gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
        $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include