From d5c22e0757f2fd63b5dba5428a9e22542cba4daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 1 Jul 2003 19:26:26 +0000 Subject: [PATCH] fixed duplicate file git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 96 +++++++++++++++++++++------------------ build/bakefiles/files.bkl | 1 - 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/Makefile.in b/Makefile.in index ae20f7a925..b81707db35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,26 +42,26 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) $(PIC_FLAG) -HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(CXXFLAGS) -HTMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) +MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) $(PIC_FLAG) +HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(CXXFLAGS) +HTMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) WXREGEX_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXPNG_CFLAGS = $(CPPFLAGS) $(__INC_ZLIB_p) $(CFLAGS) -CORELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=0 $(CFLAGS) +CORELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=0 $(CFLAGS) WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXJPEG_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXTIFF_CFLAGS = $(CPPFLAGS) $(CFLAGS) -CORELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=0 $(CXXFLAGS) -COREDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG) -MONOLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 $(CXXFLAGS) -BASELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) -MONODLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) -COREDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG) +CORELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=0 $(CXXFLAGS) +COREDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG) +MONOLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 $(CXXFLAGS) +BASELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) +MONODLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) +COREDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG) WXODBC_CFLAGS = $(CPPFLAGS) $(CFLAGS) -MONOLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 $(CFLAGS) -BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) $(PIC_FLAG) -BASEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $(PIC_FLAG) -BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) +MONOLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 $(CFLAGS) +BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) $(PIC_FLAG) +BASEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $(PIC_FLAG) +BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) ### Conditionally set variables: ### @@ -602,34 +602,34 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_src @COND_WXUNIV_1@WXUNIVNAME = univ @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_utilsunx.o @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_utilsunx.o -@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_mslu.o monodll_volume.o +@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_main.o monodll_mslu.o monodll_volume.o @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_utilsunx.o @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_utilsunx.o -@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_mslu.o monolib_volume.o +@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_main.o monolib_mslu.o monolib_volume.o @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_utilsunx.o @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_utilsunx.o -@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_mslu.o basedll_volume.o +@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_main.o basedll_mslu.o basedll_volume.o @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_utilsunx.o @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_utilsunx.o -@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_mslu.o baselib_volume.o +@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_main.o baselib_mslu.o baselib_volume.o @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_utilsunx.o @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_utilsunx.o -@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_mslu.o coredll_volume.o +@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_main.o coredll_mslu.o coredll_volume.o @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_utilsunx.o @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_utilsunx.o -@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_mslu.o corelib_volume.o +@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_main.o corelib_mslu.o corelib_volume.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_baseunix.o monodll_dir.o monodll_gsocket.o monodll_mimetmac.o monodll_utils.o monodll_utilsexc.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_baseunix.o monodll_dir.o monodll_gsocket.o monodll_mimetype.o monodll_snglinst.o monodll_threadpsx.o -@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_gsocket.o monodll_gsockmsw.o monodll_basemsw.o monodll_dde.o monodll_dir.o monodll_main.o monodll_mimetype.o monodll_regconf.o monodll_registry.o monodll_snglinst.o monodll_thread.o monodll_utils.o monodll_utilsexc.o +@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_gsocket.o monodll_gsockmsw.o monodll_basemsw.o monodll_dde.o monodll_dir.o monodll_mimetype.o monodll_regconf.o monodll_registry.o monodll_snglinst.o monodll_thread.o monodll_utils.o monodll_utilsexc.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_baseunix.o monolib_dir.o monolib_gsocket.o monolib_mimetmac.o monolib_utils.o monolib_utilsexc.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_baseunix.o monolib_dir.o monolib_gsocket.o monolib_mimetype.o monolib_snglinst.o monolib_threadpsx.o -@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o monolib_gsockmsw.o monolib_basemsw.o monolib_dde.o monolib_dir.o monolib_main.o monolib_mimetype.o monolib_regconf.o monolib_registry.o monolib_snglinst.o monolib_thread.o monolib_utils.o monolib_utilsexc.o +@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o monolib_gsockmsw.o monolib_basemsw.o monolib_dde.o monolib_dir.o monolib_mimetype.o monolib_regconf.o monolib_registry.o monolib_snglinst.o monolib_thread.o monolib_utils.o monolib_utilsexc.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_baseunix.o basedll_dir.o basedll_gsocket.o basedll_mimetmac.o basedll_utils.o basedll_utilsexc.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_baseunix.o basedll_dir.o basedll_gsocket.o basedll_mimetype.o basedll_snglinst.o basedll_threadpsx.o -@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_gsocket.o basedll_gsockmsw.o basedll_basemsw.o basedll_dde.o basedll_dir.o basedll_main.o basedll_mimetype.o basedll_regconf.o basedll_registry.o basedll_snglinst.o basedll_thread.o basedll_utils.o basedll_utilsexc.o +@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_gsocket.o basedll_gsockmsw.o basedll_basemsw.o basedll_dde.o basedll_dir.o basedll_mimetype.o basedll_regconf.o basedll_registry.o basedll_snglinst.o basedll_thread.o basedll_utils.o basedll_utilsexc.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_baseunix.o baselib_dir.o baselib_gsocket.o baselib_mimetmac.o baselib_utils.o baselib_utilsexc.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_baseunix.o baselib_dir.o baselib_gsocket.o baselib_mimetype.o baselib_snglinst.o baselib_threadpsx.o -@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_gsocket.o baselib_gsockmsw.o baselib_basemsw.o baselib_dde.o baselib_dir.o baselib_main.o baselib_mimetype.o baselib_regconf.o baselib_registry.o baselib_snglinst.o baselib_thread.o baselib_utils.o baselib_utilsexc.o +@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_gsocket.o baselib_gsockmsw.o baselib_basemsw.o baselib_dde.o baselib_dir.o baselib_mimetype.o baselib_regconf.o baselib_registry.o baselib_snglinst.o baselib_thread.o baselib_utils.o baselib_utilsexc.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) monodll_selstore.o monodll_busyinfo.o monodll_calctrl.o monodll_choicdgg.o monodll_dcbuffer.o monodll_dcpsg.o monodll_dirctrlg.o monodll_grid.o monodll_gridctrl.o monodll_gridsel.o monodll_laywin.o monodll_logg.o monodll_numdlgg.o monodll_panelg.o monodll_progdlgg.o monodll_sashwin.o monodll_scrlwing.o monodll_spinctlg.o monodll_splash.o monodll_splitter.o monodll_tbarsmpl.o monodll_textdlgg.o monodll_tipdlg.o monodll_tipwin.o monodll_treectlg.o monodll_wizard.o monodll_appcmn.o monodll_fontmap.o monodll_accesscmn.o monodll_artprov.o monodll_artstd.o monodll_bmpbase.o monodll_choiccmn.o monodll_clipcmn.o monodll_cmdproc.o monodll_cmndata.o monodll_containr.o monodll_cshelp.o monodll_ctrlcmn.o monodll_ctrlsub.o monodll_datacmn.o monodll_dbgrid.o monodll_dcbase.o monodll_dlgcmn.o monodll_dndcmn.o monodll_dobjcmn.o monodll_docmdi.o monodll_docview.o monodll_dpycmn.o monodll_dseldlg.o monodll_effects.o monodll_fddlgcmn.o monodll_fldlgcmn.o monodll_fontcmn.o monodll_framecmn.o monodll_timercmn.o monodll_toplvcmn.o monodll_gaugecmn.o monodll_gdicmn.o monodll_geometry.o monodll_gifdecod.o monodll_helpbase.o monodll_iconbndl.o monodll_imagall.o monodll_imagbmp.o monodll_image.o monodll_imaggif.o monodll_imagiff.o monodll_imagjpeg.o monodll_imagpcx.o monodll_imagpng.o monodll_imagpnm.o monodll_imagtiff.o monodll_imagxpm.o monodll_imagfill.o monodll_layout.o monodll_lboxcmn.o monodll_matrix.o monodll_menucmn.o monodll_nbkbase.o monodll_paper.o monodll_popupcmn.o monodll_prntbase.o monodll_quantize.o monodll_radiocmn.o monodll_rgncmn.o monodll_settcmn.o monodll_sizer.o monodll_statbar.o monodll_tbarbase.o monodll_textcmn.o monodll_treebase.o monodll_valgen.o monodll_validate.o monodll_valtext.o monodll_wincmn.o monodll_xpmdecod.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__UNIV_TEXTCTRL_OBJECTS) monodll_bmpbuttn.o monodll_button.o monodll_checkbox.o monodll_checklst.o monodll_choice.o monodll_colschem.o monodll_combobox.o monodll_control.o monodll_dialog.o monodll_framuniv.o monodll_topluniv.o monodll_gauge.o monodll_inpcons.o monodll_inphand.o monodll_listbox.o monodll_menu.o monodll_notebook.o monodll_radiobox.o monodll_radiobut.o monodll_renderer.o monodll_scrarrow.o monodll_scrolbar.o monodll_scrthumb.o monodll_slider.o monodll_spinbutt.o monodll_statbmp.o monodll_statbox.o monodll_statline.o monodll_stattext.o monodll_statusbr.o monodll_toolbar.o monodll_theme.o monodll_winuniv.o monodll_caret.o monodll_mdig.o monodll_imaglist.o monodll_colrdlgg.o monodll_listctrl.o monodll_filedlgg.o monodll_dirdlgg.o monodll_prntdlgg.o monodll_accel.o monodll_msgdlgg.o monodll_fdrepdlg.o monodll_fontdlgg.o monodll_tabg.o monodll_gtk.o monodll_win32.o monodll_metal.o monodll_selstore.o monodll_busyinfo.o monodll_calctrl.o monodll_choicdgg.o monodll_dcbuffer.o monodll_dcpsg.o monodll_dirctrlg.o monodll_grid.o monodll_gridctrl.o monodll_gridsel.o monodll_laywin.o monodll_logg.o monodll_numdlgg.o monodll_panelg.o monodll_progdlgg.o monodll_sashwin.o monodll_scrlwing.o monodll_spinctlg.o monodll_splash.o monodll_splitter.o monodll_tbarsmpl.o monodll_textdlgg.o monodll_tipdlg.o monodll_tipwin.o monodll_treectlg.o monodll_wizard.o monodll_appcmn.o monodll_fontmap.o monodll_accesscmn.o monodll_artprov.o monodll_artstd.o monodll_bmpbase.o monodll_choiccmn.o monodll_clipcmn.o monodll_cmdproc.o monodll_cmndata.o monodll_containr.o monodll_cshelp.o monodll_ctrlcmn.o monodll_ctrlsub.o monodll_datacmn.o monodll_dbgrid.o monodll_dcbase.o monodll_dlgcmn.o monodll_dndcmn.o monodll_dobjcmn.o monodll_docmdi.o monodll_docview.o monodll_dpycmn.o monodll_dseldlg.o monodll_effects.o monodll_fddlgcmn.o monodll_fldlgcmn.o monodll_fontcmn.o monodll_framecmn.o monodll_timercmn.o monodll_toplvcmn.o monodll_gaugecmn.o monodll_gdicmn.o monodll_geometry.o monodll_gifdecod.o monodll_helpbase.o monodll_iconbndl.o monodll_imagall.o monodll_imagbmp.o monodll_image.o monodll_imaggif.o monodll_imagiff.o monodll_imagjpeg.o monodll_imagpcx.o monodll_imagpng.o monodll_imagpnm.o monodll_imagtiff.o monodll_imagxpm.o monodll_imagfill.o monodll_layout.o monodll_lboxcmn.o monodll_matrix.o monodll_menucmn.o monodll_nbkbase.o monodll_paper.o monodll_popupcmn.o monodll_prntbase.o monodll_quantize.o monodll_radiocmn.o monodll_rgncmn.o monodll_settcmn.o monodll_sizer.o monodll_statbar.o monodll_tbarbase.o monodll_textcmn.o monodll_treebase.o monodll_valgen.o monodll_validate.o monodll_valtext.o monodll_wincmn.o monodll_xpmdecod.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_9) $(__GUI_SRC_OBJECTS_1) monolib_selstore.o monolib_busyinfo.o monolib_calctrl.o monolib_choicdgg.o monolib_dcbuffer.o monolib_dcpsg.o monolib_dirctrlg.o monolib_grid.o monolib_gridctrl.o monolib_gridsel.o monolib_laywin.o monolib_logg.o monolib_numdlgg.o monolib_panelg.o monolib_progdlgg.o monolib_sashwin.o monolib_scrlwing.o monolib_spinctlg.o monolib_splash.o monolib_splitter.o monolib_tbarsmpl.o monolib_textdlgg.o monolib_tipdlg.o monolib_tipwin.o monolib_treectlg.o monolib_wizard.o monolib_appcmn.o monolib_fontmap.o monolib_accesscmn.o monolib_artprov.o monolib_artstd.o monolib_bmpbase.o monolib_choiccmn.o monolib_clipcmn.o monolib_cmdproc.o monolib_cmndata.o monolib_containr.o monolib_cshelp.o monolib_ctrlcmn.o monolib_ctrlsub.o monolib_datacmn.o monolib_dbgrid.o monolib_dcbase.o monolib_dlgcmn.o monolib_dndcmn.o monolib_dobjcmn.o monolib_docmdi.o monolib_docview.o monolib_dpycmn.o monolib_dseldlg.o monolib_effects.o monolib_fddlgcmn.o monolib_fldlgcmn.o monolib_fontcmn.o monolib_framecmn.o monolib_timercmn.o monolib_toplvcmn.o monolib_gaugecmn.o monolib_gdicmn.o monolib_geometry.o monolib_gifdecod.o monolib_helpbase.o monolib_iconbndl.o monolib_imagall.o monolib_imagbmp.o monolib_image.o monolib_imaggif.o monolib_imagiff.o monolib_imagjpeg.o monolib_imagpcx.o monolib_imagpng.o monolib_imagpnm.o monolib_imagtiff.o monolib_imagxpm.o monolib_imagfill.o monolib_layout.o monolib_lboxcmn.o monolib_matrix.o monolib_menucmn.o monolib_nbkbase.o monolib_paper.o monolib_popupcmn.o monolib_prntbase.o monolib_quantize.o monolib_radiocmn.o monolib_rgncmn.o monolib_settcmn.o monolib_sizer.o monolib_statbar.o monolib_tbarbase.o monolib_textcmn.o monolib_treebase.o monolib_valgen.o monolib_validate.o monolib_valtext.o monolib_wincmn.o monolib_xpmdecod.o @@ -662,12 +662,12 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_src @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = corelib_gsockmot.o corelib_accel.o corelib_app.o corelib_bmpbuttn.o corelib_bmpmotif.o corelib_button.o corelib_checkbox.o corelib_checklst.o corelib_choice.o corelib_clipbrd.o corelib_colour.o corelib_combobox.o corelib_combobox_native.o corelib_control.o corelib_cursor.o corelib_data.o corelib_dataobj.o corelib_dc.o corelib_dcclient.o corelib_dcmemory.o corelib_dcscreen.o corelib_dialog.o corelib_evtloop.o corelib_filedlg.o corelib_font.o corelib_frame.o corelib_gauge.o corelib_gdiobj.o corelib_glcanvas.o corelib_icon.o corelib_listbox.o corelib_main.o corelib_mdi.o corelib_menu.o corelib_menuitem.o corelib_minifram.o corelib_msgdlg.o corelib_palette.o corelib_radiobox.o corelib_radiobut.o corelib_scrolbar.o corelib_settings.o corelib_slider.o corelib_spinbutt.o corelib_statbmp.o corelib_statbox.o corelib_stattext.o corelib_toolbar.o corelib_textctrl.o corelib_timer.o corelib_toplevel.o corelib_utils.o corelib_window.o corelib_fdrepdlg.o corelib_listctrl.o corelib_imaglist.o corelib_notebook.o corelib_fontdlgg.o corelib_colrdlgg.o corelib_statline.o corelib_tabg.o corelib_dirdlgg.o corelib_prntdlgg.o corelib_statusbr.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = corelib_statusbr.o corelib_uxtheme.o corelib_access.o corelib_accel.o corelib_bmpbuttn.o corelib_button.o corelib_checkbox.o corelib_checklst.o corelib_choice.o corelib_colordlg.o corelib_combobox.o corelib_control.o corelib_dialog.o corelib_dragimag.o corelib_fdrepdlg.o corelib_filedlg.o corelib_fontdlg.o corelib_frame.o corelib_gauge95.o corelib_imaglist.o corelib_iniconf.o corelib_listbox.o corelib_listctrl.o corelib_mdi.o corelib_menu.o corelib_menuitem.o corelib_metafile.o corelib_msgdlg.o corelib_nativdlg.o corelib_notebook.o corelib_ownerdrw.o corelib_penwin.o corelib_printdlg.o corelib_printwin.o corelib_radiobox.o corelib_radiobut.o corelib_scrolbar.o corelib_slider95.o corelib_spinbutt.o corelib_spinctrl.o corelib_statbmp.o corelib_statbox.o corelib_statbr95.o corelib_statline.o corelib_stattext.o corelib_tabctrl.o corelib_tbar95.o corelib_textctrl.o corelib_tglbtn.o corelib_treectrl.o @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = corelib_accel.o corelib_app.o corelib_bitmap.o corelib_bmpbuttn.o corelib_brush.o corelib_button.o corelib_checkbox.o corelib_checklst.o corelib_choice.o corelib_clipbrd.o corelib_colour.o corelib_combobox.o corelib_control.o corelib_cursor.o corelib_data.o corelib_dataobj.o corelib_dc.o corelib_dcclient.o corelib_dcmemory.o corelib_dcprint.o corelib_dcscreen.o corelib_dialog.o corelib_dnd.o corelib_filedlg.o corelib_font.o corelib_fontdlg.o corelib_fontenum.o corelib_fontutil.o corelib_frame.o corelib_gauge.o corelib_gdiimage.o corelib_gdiobj.o corelib_helpwin.o corelib_icon.o corelib_iniconf.o corelib_joystick.o corelib_listbox.o corelib_main.o corelib_menu.o corelib_menuitem.o corelib_metafile.o corelib_mimetype.o corelib_msgdlg.o corelib_nativdlg.o corelib_notebook.o corelib_ownerdrw.o corelib_palette.o corelib_pen.o corelib_print.o corelib_radiobox.o corelib_radiobut.o corelib_region.o corelib_scrolbar.o corelib_settings.o corelib_slider.o corelib_spinbutt.o corelib_spinctrl.o corelib_statbmp.o corelib_statbox.o corelib_statline.o corelib_stattext.o corelib_tabctrl.o corelib_textctrl.o corelib_timer.o corelib_thread.o corelib_toolbar.o corelib_tooltip.o corelib_toplevel.o corelib_wave.o corelib_window.o corelib_gsocket.o corelib_gsockpm.o -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) @@ -816,8 +816,8 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_src all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__macos_res___depname) -@COND_MONOLITHIC_0_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o basedll_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) -@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o basedll_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) $(LDFLAGS) $(__basedll___importlib) -L$(top_builddir)lib $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) +@COND_MONOLITHIC_0_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) +@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) $(LDFLAGS) $(__basedll___importlib) -L$(top_builddir)lib $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) @COND_MONOLITHIC_0_SHARED_1@ $(__basedll___so_symlinks_cmd) basedll_appbase.o: $(srcdir)/src/common/appbase.cpp @@ -1105,9 +1105,9 @@ basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5.a: baselib_appbase.o baselib_clntdata.o baselib_cmdline.o baselib_config.o baselib_datetime.o baselib_datstrm.o baselib_db.o baselib_dbtable.o baselib_dircmn.o baselib_dynarray.o baselib_dynlib.o baselib_dynload.o baselib_encconv.o baselib_extended.o baselib_ffile.o baselib_file.o baselib_fileconf.o baselib_filefn.o baselib_filename.o baselib_filesys.o baselib_fmapbase.o baselib_fs_inet.o baselib_fs_zip.o baselib_ftp.o baselib_hash.o baselib_hashmap.o baselib_http.o baselib_init.o baselib_intl.o baselib_ipcbase.o baselib_list.o baselib_log.o baselib_longlong.o baselib_memory.o baselib_mimecmn.o baselib_module.o baselib_mstream.o baselib_object.o baselib_process.o baselib_protocol.o baselib_regex.o baselib_sckaddr.o baselib_sckfile.o baselib_sckipc.o baselib_sckstrm.o baselib_socket.o baselib_stopwatch.o baselib_strconv.o baselib_stream.o baselib_string.o baselib_sysopt.o baselib_textbuf.o baselib_textfile.o baselib_tokenzr.o baselib_txtstrm.o baselib_unzip.o baselib_url.o baselib_variant.o baselib_wfstream.o baselib_wxchar.o baselib_zipstrm.o baselib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_3) baselib_fs_mem.o baselib_msgout.o baselib_utilscmn.o baselib_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) +@COND_MONOLITHIC_0_SHARED_0@$(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5.a: baselib_appbase.o baselib_clntdata.o baselib_cmdline.o baselib_config.o baselib_datetime.o baselib_datstrm.o baselib_db.o baselib_dbtable.o baselib_dircmn.o baselib_dynarray.o baselib_dynlib.o baselib_dynload.o baselib_encconv.o baselib_extended.o baselib_ffile.o baselib_file.o baselib_fileconf.o baselib_filefn.o baselib_filename.o baselib_filesys.o baselib_fmapbase.o baselib_fs_inet.o baselib_fs_zip.o baselib_ftp.o baselib_hash.o baselib_hashmap.o baselib_http.o baselib_init.o baselib_intl.o baselib_ipcbase.o baselib_list.o baselib_log.o baselib_longlong.o baselib_memory.o baselib_mimecmn.o baselib_module.o baselib_mstream.o baselib_object.o baselib_process.o baselib_protocol.o baselib_regex.o baselib_sckaddr.o baselib_sckfile.o baselib_sckipc.o baselib_sckstrm.o baselib_socket.o baselib_stopwatch.o baselib_strconv.o baselib_stream.o baselib_string.o baselib_sysopt.o baselib_textbuf.o baselib_textfile.o baselib_tokenzr.o baselib_txtstrm.o baselib_unzip.o baselib_url.o baselib_variant.o baselib_wfstream.o baselib_wxchar.o baselib_zipstrm.o baselib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_3) baselib_event.o baselib_fs_mem.o baselib_msgout.o baselib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ -@COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ baselib_appbase.o baselib_clntdata.o baselib_cmdline.o baselib_config.o baselib_datetime.o baselib_datstrm.o baselib_db.o baselib_dbtable.o baselib_dircmn.o baselib_dynarray.o baselib_dynlib.o baselib_dynload.o baselib_encconv.o baselib_extended.o baselib_ffile.o baselib_file.o baselib_fileconf.o baselib_filefn.o baselib_filename.o baselib_filesys.o baselib_fmapbase.o baselib_fs_inet.o baselib_fs_zip.o baselib_ftp.o baselib_hash.o baselib_hashmap.o baselib_http.o baselib_init.o baselib_intl.o baselib_ipcbase.o baselib_list.o baselib_log.o baselib_longlong.o baselib_memory.o baselib_mimecmn.o baselib_module.o baselib_mstream.o baselib_object.o baselib_process.o baselib_protocol.o baselib_regex.o baselib_sckaddr.o baselib_sckfile.o baselib_sckipc.o baselib_sckstrm.o baselib_socket.o baselib_stopwatch.o baselib_strconv.o baselib_stream.o baselib_string.o baselib_sysopt.o baselib_textbuf.o baselib_textfile.o baselib_tokenzr.o baselib_txtstrm.o baselib_unzip.o baselib_url.o baselib_variant.o baselib_wfstream.o baselib_wxchar.o baselib_zipstrm.o baselib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_3) baselib_fs_mem.o baselib_msgout.o baselib_utilscmn.o baselib_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) +@COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ baselib_appbase.o baselib_clntdata.o baselib_cmdline.o baselib_config.o baselib_datetime.o baselib_datstrm.o baselib_db.o baselib_dbtable.o baselib_dircmn.o baselib_dynarray.o baselib_dynlib.o baselib_dynload.o baselib_encconv.o baselib_extended.o baselib_ffile.o baselib_file.o baselib_fileconf.o baselib_filefn.o baselib_filename.o baselib_filesys.o baselib_fmapbase.o baselib_fs_inet.o baselib_fs_zip.o baselib_ftp.o baselib_hash.o baselib_hashmap.o baselib_http.o baselib_init.o baselib_intl.o baselib_ipcbase.o baselib_list.o baselib_log.o baselib_longlong.o baselib_memory.o baselib_mimecmn.o baselib_module.o baselib_mstream.o baselib_object.o baselib_process.o baselib_protocol.o baselib_regex.o baselib_sckaddr.o baselib_sckfile.o baselib_sckipc.o baselib_sckstrm.o baselib_socket.o baselib_stopwatch.o baselib_strconv.o baselib_stream.o baselib_string.o baselib_sysopt.o baselib_textbuf.o baselib_textfile.o baselib_tokenzr.o baselib_txtstrm.o baselib_unzip.o baselib_url.o baselib_variant.o baselib_wfstream.o baselib_wxchar.o baselib_zipstrm.o baselib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_3) baselib_event.o baselib_fs_mem.o baselib_msgout.o baselib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ baselib_appbase.o: $(srcdir)/src/common/appbase.cpp @@ -1422,8 +1422,8 @@ clean: rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5.a rm -f lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o coredll_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o coredll_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(LDFLAGS) $(__coredll___importlib) -L$(top_builddir)lib $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver) $(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5$(DLLIMPEXT) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(LDFLAGS) $(__coredll___importlib) -L$(top_builddir)lib $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5$(DLLIMPEXT) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd) coredll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c @@ -2605,6 +2605,9 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/cocoa/main.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_PLATFORM_WIN32_1@coredll_main.o: $(srcdir)/src/msw/main.cpp +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3538,9 +3541,9 @@ coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp @COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5.a: corelib_fs_mem.o corelib_msgout.o corelib_utilscmn.o corelib_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) $(__CORE_SRC_OBJECTS_3) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5.a: corelib_event.o corelib_fs_mem.o corelib_msgout.o corelib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) $(__CORE_SRC_OBJECTS_3) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ corelib_fs_mem.o corelib_msgout.o corelib_utilscmn.o corelib_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) $(__CORE_SRC_OBJECTS_3) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ corelib_event.o corelib_fs_mem.o corelib_msgout.o corelib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) $(__CORE_SRC_OBJECTS_3) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ corelib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c @@ -4722,6 +4725,9 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/cocoa/main.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_PLATFORM_WIN32_1@corelib_main.o: $(srcdir)/src/msw/main.cpp +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5659,8 +5665,8 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o $(__coredll___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o $(LDFLAGS) $(__htmldll___importlib) -L$(top_builddir)lib $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(DLLIMPEXT) $(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5$(DLLIMPEXT) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o $(__coredll___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o $(LDFLAGS) $(__htmldll___importlib) -L$(top_builddir)lib $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(DLLIMPEXT) $(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5$(DLLIMPEXT) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__htmldll___so_symlinks_cmd) htmldll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp @@ -5794,7 +5800,7 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in $(INSTALL_DIR) $(libdir)/wx/include/$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5/wx (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5/wx/setup.h $(libdir)/wx/include/$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5/wx) $(INSTALL_DIR) $(includedir) - for f in wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_inet.h wx/fs_zip.h wx/fs_mem.h wx/dbkeyg.h wx/gsocket.h wx/hash.h wx/hashmap.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/timer.h wx/tokenzr.h wx/txtstrm.h wx/url.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h $(BASE_PLATFORM_HDR) wx/selstore.h wx/generic/accel.h wx/generic/calctrl.h wx/generic/caret.h wx/generic/choicdgg.h wx/generic/colrdlgg.h wx/generic/dcpsg.h wx/generic/dirctrlg.h wx/generic/fontdlgg.h wx/generic/filedlgg.h wx/generic/grid.h wx/generic/gridctrl.h wx/generic/grid.h wx/generic/helpext.h wx/generic/logg.h wx/helphtml.h wx/generic/imaglist.h wx/generic/laywin.h wx/generic/msgdlgg.h wx/generic/notebook.h wx/generic/panelg.h wx/generic/prntdlgg.h wx/generic/progdlgg.h wx/generic/sashwin.h wx/generic/scrolwin.h wx/generic/spinctlg.h wx/generic/splash.h wx/generic/splitter.h wx/generic/textdlgg.h wx/generic/timer.h wx/generic/wizard.h wx/generic/treectlg.h $(GUI_HDR) $(LOWLEVEL_HDR); do \ + for f in wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_inet.h wx/fs_zip.h wx/fs_mem.h wx/gsocket.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/url.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h $(BASE_PLATFORM_HDR) wx/selstore.h wx/generic/accel.h wx/generic/calctrl.h wx/generic/caret.h wx/generic/choicdgg.h wx/generic/colrdlgg.h wx/generic/dcpsg.h wx/generic/dirctrlg.h wx/generic/fontdlgg.h wx/generic/filedlgg.h wx/generic/grid.h wx/generic/gridctrl.h wx/generic/grid.h wx/generic/helpext.h wx/generic/logg.h wx/helphtml.h wx/generic/imaglist.h wx/generic/laywin.h wx/generic/msgdlgg.h wx/generic/notebook.h wx/generic/panelg.h wx/generic/prntdlgg.h wx/generic/progdlgg.h wx/generic/sashwin.h wx/generic/scrolwin.h wx/generic/spinctlg.h wx/generic/splash.h wx/generic/splitter.h wx/generic/textdlgg.h wx/generic/timer.h wx/generic/wizard.h wx/generic/treectlg.h $(GUI_HDR) $(LOWLEVEL_HDR); do \ if test ! -d $(includedir)/`dirname $$f` ; then \ $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ fi; \ @@ -5892,8 +5898,8 @@ install-wxconfig: @COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r $(libdir) @COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc $(libdir) -@COND_MONOLITHIC_1_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o monodll_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) -@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o monodll_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) $(LDFLAGS) $(__monodll___importlib) -L$(top_builddir)lib $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) +@COND_MONOLITHIC_1_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) +@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) $(LDFLAGS) $(__monodll___importlib) -L$(top_builddir)lib $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd) monodll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c @@ -8329,9 +8335,9 @@ monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp monodll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_MONOLITHIC_1_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.a: monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o monolib_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1) +@COND_MONOLITHIC_1_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.a: monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1) @COND_MONOLITHIC_1_SHARED_0@ rm -f $@ -@COND_MONOLITHIC_1_SHARED_0@ $(AR) rcu $@ monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o monolib_event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1) +@COND_MONOLITHIC_1_SHARED_0@ $(AR) rcu $@ monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1) @COND_MONOLITHIC_1_SHARED_0@ $(RANLIB) $@ monolib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 737387243b..2be8c5df47 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -170,7 +170,6 @@ src/common/fs_mem.cpp src/common/msgout.cpp src/common/utilscmn.cpp - src/common/event.cpp wx/arrimpl.cpp