X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d18f8b43f399e07cedccef70b7eae93f385db87..45bbbc54304272eb25b96e6c63b57107991bcd26:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 2f97799e9e..37b793b168 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,6 +20,7 @@ DEREZ = @DEREZ@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_ODBC = @EXTRALIBS_ODBC@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ EXTRALIBS_XML = @EXTRALIBS_XML@ @@ -28,6 +29,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ LDFLAGS = @LDFLAGS@ +LIBPREFIX = @LIBPREFIX@ LN_S = @LN_S@ PIC_FLAG = @PIC_FLAG@ RANLIB = @RANLIB@ @@ -51,11 +53,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) $(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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) \ - $(PIC_FLAG) +ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ advdll_calctrl.o \ advdll_dcbuffer.o \ @@ -69,10 +70,10 @@ ADVDLL_OBJECTS = \ advdll_tipdlg.o \ advdll_wizard.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_2) -ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) $(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) $(__INC_EXPAT_p) $(CXXFLAGS) +ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -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) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ advlib_calctrl.o \ advlib_dcbuffer.o \ @@ -87,6 +88,7 @@ ADVLIB_OBJECTS = \ advlib_wizard.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_3) ALL_BASE_HEADERS = \ + wx/afterstd.h \ wx/app.h \ wx/apptrait.h \ wx/arrimpl.cpp \ @@ -112,6 +114,7 @@ ALL_BASE_HEADERS = \ wx/dynload.h \ wx/encconv.h \ wx/event.h \ + wx/except.h \ wx/features.h \ wx/ffile.h \ wx/file.h \ @@ -123,6 +126,7 @@ ALL_BASE_HEADERS = \ wx/fontmap.h \ wx/fs_mem.h \ wx/fs_zip.h \ + wx/gzstream.h \ wx/hash.h \ wx/hashmap.h \ wx/hashset.h \ @@ -155,6 +159,7 @@ ALL_BASE_HEADERS = \ wx/regex.h \ wx/scopeguard.h \ wx/snglinst.h \ + wx/stack.h \ wx/stopwatch.h \ wx/strconv.h \ wx/stream.h \ @@ -177,6 +182,8 @@ ALL_BASE_HEADERS = \ wx/wx.h \ wx/wxchar.h \ wx/wxprec.h \ + wx/xti.h \ + wx/xtistrm.h \ wx/zipstrm.h \ wx/zstream.h \ $(BASE_PLATFORM_HDR) \ @@ -192,7 +199,11 @@ ALL_BASE_HEADERS = \ wx/socket.h \ wx/url.h \ $(NET_PLATFORM_HDR) \ - wx/xml/xml.h + wx/xml/xml.h \ + wx/xtixml.h \ + wx/db.h \ + wx/dbkeyg.h \ + wx/dbtable.h ALL_BASE_SOURCES = \ src/common/appbase.cpp \ src/common/clntdata.cpp \ @@ -214,6 +225,7 @@ ALL_BASE_SOURCES = \ src/common/filesys.cpp \ src/common/fmapbase.cpp \ src/common/fs_zip.cpp \ + src/common/gzstream.cpp \ src/common/hash.cpp \ src/common/hashmap.cpp \ src/common/init.cpp \ @@ -242,6 +254,8 @@ ALL_BASE_SOURCES = \ src/common/variant.cpp \ src/common/wfstream.cpp \ src/common/wxchar.cpp \ + src/common/xti.cpp \ + src/common/xtistrm.cpp \ src/common/zipstrm.cpp \ src/common/zstream.cpp \ src/unix/baseunix.cpp \ @@ -264,12 +278,17 @@ ALL_BASE_SOURCES = \ src/mac/mimetmac.cpp \ src/unix/baseunix.cpp \ src/mac/utilsexc.cpp \ + src/mac/thread.cpp \ + src/mac/macnotfy.cpp \ + src/mac/morefilex/MoreFilesX.c \ src/unix/baseunix.cpp \ src/unix/dir.cpp \ src/unix/mimetype.cpp \ src/unix/snglinst.cpp \ src/unix/threadpsx.cpp \ src/os2/dir.cpp \ + src/os2/mimetype.cpp \ + src/os2/thread.cpp \ src/os2/utils.cpp \ src/os2/utilsexc.cpp \ src/common/event.cpp \ @@ -278,6 +297,7 @@ ALL_BASE_SOURCES = \ src/common/utilscmn.cpp \ src/unix/utilsunx.cpp \ src/mac/utils.cpp \ + src/mac/uma.cpp \ src/unix/utilsunx.cpp \ src/msw/main.cpp \ src/msw/mslu.cpp \ @@ -295,20 +315,23 @@ ALL_BASE_SOURCES = \ src/unix/gsocket.c \ src/msw/gsocket.c \ src/mac/gsocket.c \ - src/xml/xml.cpp + src/xml/xml.cpp \ + src/common/xtixml.cpp \ + src/common/db.cpp \ + src/common/dbtable.cpp ALL_HEADERS = \ $(ALL_BASE_HEADERS) \ $(ALL_GUI_HEADERS) -BASEDLL_CFLAGS = $(__basedll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +BASEDLL_CFLAGS = $(__basedll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 $(CFLAGS) $(PIC_FLAG) -BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 $(CXXFLAGS) $(PIC_FLAG) + -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ basedll_appbase.o \ basedll_clntdata.o \ @@ -330,6 +353,7 @@ BASEDLL_OBJECTS = \ basedll_filesys.o \ basedll_fmapbase.o \ basedll_fs_zip.o \ + basedll_gzstream.o \ basedll_hash.o \ basedll_hashmap.o \ basedll_init.o \ @@ -358,6 +382,8 @@ BASEDLL_OBJECTS = \ basedll_variant.o \ basedll_wfstream.o \ basedll_wxchar.o \ + basedll_xti.o \ + basedll_xtistrm.o \ basedll_zipstrm.o \ basedll_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_2) \ @@ -367,14 +393,15 @@ BASEDLL_OBJECTS = \ basedll_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2) -BASELIB_CFLAGS = $(__baselib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CFLAGS) -BASELIB_CXXFLAGS = $(__baselib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +BASELIB_CFLAGS = $(__baselib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) \ + $(CXXFLAGS) BASELIB_OBJECTS = \ baselib_appbase.o \ baselib_clntdata.o \ @@ -396,6 +423,7 @@ BASELIB_OBJECTS = \ baselib_filesys.o \ baselib_fmapbase.o \ baselib_fs_zip.o \ + baselib_gzstream.o \ baselib_hash.o \ baselib_hashmap.o \ baselib_init.o \ @@ -424,6 +452,8 @@ BASELIB_OBJECTS = \ baselib_variant.o \ baselib_wfstream.o \ baselib_wxchar.o \ + baselib_xti.o \ + baselib_xtistrm.o \ baselib_zipstrm.o \ baselib_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_3) \ @@ -433,16 +463,16 @@ BASELIB_OBJECTS = \ baselib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3) -COREDLL_CFLAGS = $(__coredll_PCH_INC) $(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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \ - -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG) -COREDLL_CXXFLAGS = $(__coredll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +COREDLL_CFLAGS = $(__coredll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \ - -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG) + -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ coredll_event.o \ coredll_fs_mem.o \ @@ -451,14 +481,14 @@ COREDLL_OBJECTS = \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \ $(__CORE_SRC_OBJECTS_2) -CORELIB_CFLAGS = $(__corelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +CORELIB_CFLAGS = $(__corelib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) +CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CFLAGS) -CORELIB_CXXFLAGS = $(__corelib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ corelib_event.o \ corelib_fs_mem.o \ @@ -467,37 +497,37 @@ CORELIB_OBJECTS = \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \ $(__CORE_SRC_OBJECTS_3) -DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \ - $(CXXFLAGS) $(PIC_FLAG) + $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ dbgriddll_dbgrid.o -DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -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) $(__INC_EXPAT_p) $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = \ dbgridlib_dbgrid.o -GLDLL_CXXFLAGS = $(__gldll_PCH_INC) $(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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS) \ - $(PIC_FLAG) +DESTDIR = +GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(__OPENGL_SRC_OBJECTS) -GLLIB_CXXFLAGS = $(__gllib_PCH_INC) $(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) $(__INC_EXPAT_p) $(CXXFLAGS) +GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -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) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(__OPENGL_SRC_OBJECTS_1) -HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_HTML \ - $(CXXFLAGS) $(PIC_FLAG) + $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_2) \ htmldll_helpctrl.o \ @@ -521,10 +551,10 @@ HTMLDLL_OBJECTS = \ htmldll_m_tables.o \ htmldll_winpars.o \ htmldll_htmllbox.o -HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -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) $(__INC_EXPAT_p) $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_3) \ htmllib_helpctrl.o \ @@ -550,16 +580,15 @@ HTMLLIB_OBJECTS = \ htmllib_htmllbox.o LIBDIRNAME = $(top_builddir)lib LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW -MONODLL_CFLAGS = $(__monodll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) \ - $(PIC_FLAG) -MONODLL_CXXFLAGS = $(__monodll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +MONODLL_CFLAGS = $(__monodll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) +MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) \ - $(PIC_FLAG) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ monodll_appbase.o \ monodll_clntdata.o \ @@ -581,6 +610,7 @@ MONODLL_OBJECTS = \ monodll_filesys.o \ monodll_fmapbase.o \ monodll_fs_zip.o \ + monodll_gzstream.o \ monodll_hash.o \ monodll_hashmap.o \ monodll_init.o \ @@ -609,6 +639,8 @@ MONODLL_OBJECTS = \ monodll_variant.o \ monodll_wfstream.o \ monodll_wxchar.o \ + monodll_xti.o \ + monodll_xtistrm.o \ monodll_zipstrm.o \ monodll_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS) \ @@ -630,15 +662,16 @@ MONODLL_OBJECTS = \ monodll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS) \ $(__MONOLIB_GUI_SRC_OBJECTS) \ - monodll_xml.o -MONOLIB_CFLAGS = $(__monolib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ + monodll_xml.o \ + monodll_xtixml.o +MONOLIB_CFLAGS = $(__monolib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CFLAGS) -MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ monolib_appbase.o \ monolib_clntdata.o \ @@ -660,6 +693,7 @@ MONOLIB_OBJECTS = \ monolib_filesys.o \ monolib_fmapbase.o \ monolib_fs_zip.o \ + monolib_gzstream.o \ monolib_hash.o \ monolib_hashmap.o \ monolib_init.o \ @@ -688,6 +722,8 @@ MONOLIB_OBJECTS = \ monolib_variant.o \ monolib_wfstream.o \ monolib_wxchar.o \ + monolib_xti.o \ + monolib_xtistrm.o \ monolib_zipstrm.o \ monolib_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_1) \ @@ -709,17 +745,18 @@ MONOLIB_OBJECTS = \ monolib_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_1) \ $(__MONOLIB_GUI_SRC_OBJECTS_1) \ - monolib_xml.o -NETDLL_CFLAGS = $(__netdll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_NET $(CFLAGS) $(PIC_FLAG) -NETDLL_CXXFLAGS = $(__netdll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_NET $(CXXFLAGS) $(PIC_FLAG) + monolib_xml.o \ + monolib_xtixml.o +NETDLL_CFLAGS = $(__netdll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) NETDLL_OBJECTS = \ netdll_fs_inet.o \ netdll_ftp.o \ @@ -732,14 +769,14 @@ NETDLL_OBJECTS = \ netdll_socket.o \ netdll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_2) -NETLIB_CFLAGS = $(__netlib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CFLAGS) -NETLIB_CXXFLAGS = $(__netlib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) +NETLIB_CFLAGS = $(__netlib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) +NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ netlib_fs_inet.o \ netlib_ftp.o \ @@ -752,27 +789,27 @@ NETLIB_OBJECTS = \ netlib_socket.o \ netlib_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_3) -ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG) + -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ odbcdll_db.o \ odbcdll_dbtable.o -ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) ODBCLIB_OBJECTS = \ odbclib_db.o \ odbclib_dbtable.o -WXEXPAT_CFLAGS = $(CPPFLAGS) -I./src/expat $(CFLAGS) +WXEXPAT_CFLAGS = -I./src/expat $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ wxexpat_xmlparse.o \ wxexpat_xmlrole.o \ wxexpat_xmltok.o -WXJPEG_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXJPEG_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXJPEG_OBJECTS = \ wxjpeg_jcomapi.o \ wxjpeg_jutils.o \ @@ -820,7 +857,7 @@ WXJPEG_OBJECTS = \ wxjpeg_jquant1.o \ wxjpeg_jquant2.o \ wxjpeg_jdmerge.o -WXODBC_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXODBC_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXODBC_OBJECTS = \ wxodbc_catalog.o \ wxodbc_connect.o \ @@ -837,7 +874,7 @@ WXODBC_OBJECTS = \ wxodbc_misc.o \ wxodbc_prepare.o \ wxodbc_result.o -WXPNG_CFLAGS = $(CPPFLAGS) $(__INC_ZLIB_p) $(CFLAGS) +WXPNG_CFLAGS = $(__INC_ZLIB_p) $(CPPFLAGS) $(CFLAGS) WXPNG_OBJECTS = \ wxpng_png.o \ wxpng_pngerror.o \ @@ -856,13 +893,13 @@ WXPNG_OBJECTS = \ wxpng_pngwrite.o \ wxpng_pngwtran.o \ wxpng_pngwutil.o -WXREGEX_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXREGEX_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ wxregex_regcomp.o \ wxregex_regexec.o \ wxregex_regerror.o \ wxregex_regfree.o -WXTIFF_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXTIFF_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXTIFF_OBJECTS = \ $(__TIFF_PLATFORM_SRC_OBJECTS) \ wxtiff_tif_aux.o \ @@ -897,7 +934,7 @@ WXTIFF_OBJECTS = \ wxtiff_tif_warning.o \ wxtiff_tif_write.o \ wxtiff_tif_zip.o -WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXZLIB_OBJECTS = \ wxzlib_adler32.o \ wxzlib_compress.o \ @@ -913,20 +950,22 @@ WXZLIB_OBJECTS = \ wxzlib_infcodes.o \ wxzlib_infutil.o \ wxzlib_inffast.o -WX_VERSION = 2.5.0 -XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG) +WX_VERSION = 2.5.1 +XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) XMLDLL_OBJECTS = \ - xmldll_xml.o -XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) + xmldll_xml.o \ + xmldll_xtixml.o +XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ - xmllib_xml.o + xmllib_xml.o \ + xmllib_xtixml.o ### Conditionally set variables: ### @@ -938,8 +977,8 @@ XMLLIB_OBJECTS = \ @COND_TOOLKIT_MOTIF@ wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_MSW@ wx/msw/joystick.h wx/msw/taskbar.h wx/msw/wave.h -@COND_TOOLKIT_OS2@ADVANCED_PLATFORM_HDR = \ -@COND_TOOLKIT_OS2@ wx/os2/joystick.h wx/os2/wave.h +@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = wx/os2/joystick.h \ +@COND_TOOLKIT_PM@ wx/os2/wave.h @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h COND_USE_GUI_1_ALL_GUI_HEADERS = \ @@ -963,6 +1002,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/dialog.h \ wx/dirdlg.h \ wx/dragimag.h \ + wx/encinfo.h \ wx/filedlg.h \ wx/frame.h \ wx/gauge.h \ @@ -1021,9 +1061,9 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/window.h \ wx/accel.h \ wx/access.h \ - wx/afterstd.h \ wx/artprov.h \ wx/bitmap.h \ + wx/bookctrl.h \ wx/busyinfo.h \ wx/caret.h \ wx/clipbrd.h \ @@ -1068,6 +1108,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/imagtiff.h \ wx/imagxpm.h \ wx/listbase.h \ + wx/listbook.h \ wx/listctrl.h \ wx/matrix.h \ wx/menuitem.h \ @@ -1089,12 +1130,10 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/spinbutt.h \ wx/spinctrl.h \ wx/splitter.h \ - wx/stack.h \ wx/statline.h \ wx/tab.h \ wx/tabctrl.h \ wx/tbarbase.h \ - wx/tbarsmpl.h \ wx/tglbtn.h \ wx/tipwin.h \ wx/tooltip.h \ @@ -1102,6 +1141,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/treebase.h \ wx/treectrl.h \ wx/valgen.h \ + wx/vidmode.h \ wx/vlbox.h \ wx/vms_x_fix.h \ wx/vscroll.h \ @@ -1147,9 +1187,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/wxhtml.h \ wx/htmllbox.h \ $(OPENGL_HDR) \ - wx/db.h \ - wx/dbkeyg.h \ - wx/dbtable.h \ wx/dbgrid.h @COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS) COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ @@ -1233,6 +1270,7 @@ COND_TOOLKIT_COCOA_GUI_HDR = \ wx/cocoa/NSControl.h \ wx/cocoa/NSMenu.h \ wx/cocoa/NSPanel.h \ + wx/cocoa/NSTableView.h \ wx/cocoa/NSTextField.h \ wx/cocoa/NSView.h \ wx/cocoa/NSWindow.h \ @@ -1265,6 +1303,7 @@ COND_TOOLKIT_COCOA_GUI_HDR = \ wx/cocoa/gdiobj.h \ wx/cocoa/icon.h \ wx/cocoa/listbox.h \ + wx/cocoa/mbarman.h \ wx/cocoa/menu.h \ wx/cocoa/menuitem.h \ wx/cocoa/pen.h \ @@ -1490,13 +1529,13 @@ COND_TOOLKIT_MOTIF_GUI_HDR = \ wx/motif/minifram.h \ wx/motif/msgdlg.h \ wx/motif/palette.h \ + wx/motif/popupwin.h \ wx/motif/print.h \ wx/motif/private.h \ wx/motif/radiobox.h \ wx/motif/radiobut.h \ wx/motif/region.h \ wx/motif/scrolbar.h \ - wx/motif/settings.h \ wx/motif/slider.h \ wx/motif/spinbutt.h \ wx/motif/statbmp.h \ @@ -1640,8 +1679,14 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/std.ico \ wx/msw/warning.ico @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR) -COND_TOOLKIT_OS2_GUI_HDR = \ +COND_TOOLKIT_PM_GUI_HDR = \ wx/generic/caret.h \ + wx/generic/colrdlgg.h \ + wx/generic/dirdlgg.h \ + wx/generic/fdrepdlg.h \ + wx/generic/listctrl.h \ + wx/generic/mdig.h \ + wx/generic/statusbr.h \ wx/os2/accel.h \ wx/os2/app.h \ wx/os2/bitmap.h \ @@ -1673,7 +1718,6 @@ COND_TOOLKIT_OS2_GUI_HDR = \ wx/os2/gauge.h \ wx/os2/gdiimage.h \ wx/os2/gdiobj.h \ - wx/os2/gsockos2.h \ wx/os2/helpwin.h \ wx/os2/icon.h \ wx/os2/iniconf.h \ @@ -1710,12 +1754,13 @@ COND_TOOLKIT_OS2_GUI_HDR = \ wx/os2/tooltip.h \ wx/os2/toplevel.h \ wx/os2/window.h -@COND_TOOLKIT_OS2@GUI_HDR = $(COND_TOOLKIT_OS2_GUI_HDR) +@COND_TOOLKIT_PM@GUI_HDR = $(COND_TOOLKIT_PM_GUI_HDR) @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = COND_TOOLKIT_GTK_LOWLEVEL_HDR = \ wx/generic/caret.h \ wx/unix/fontutil.h \ wx/unix/utilsx11.h \ + wx/unix/displayx11.h \ wx/generic/paletteg.h @COND_TOOLKIT_GTK@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_LOWLEVEL_HDR) @COND_TOOLKIT_MAC@LOWLEVEL_HDR = @@ -1744,15 +1789,23 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR = \ wx/mgl/toplevel.h \ wx/mgl/window.h @COND_TOOLKIT_MGL@LOWLEVEL_HDR = $(COND_TOOLKIT_MGL_LOWLEVEL_HDR) -@COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = wx/generic/caret.h \ -@COND_TOOLKIT_MOTIF@ wx/unix/fontutil.h wx/unix/utilsx11.h +COND_TOOLKIT_MOTIF_LOWLEVEL_HDR = \ + wx/generic/caret.h \ + wx/unix/fontutil.h \ + wx/unix/utilsx11.h \ + wx/unix/displayx11.h \ + wx/x11/bitmap.h \ + wx/x11/brush.h \ + wx/x11/pen.h \ + wx/x11/region.h +@COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR) @COND_TOOLKIT_MSW@LOWLEVEL_HDR = -@COND_TOOLKIT_OS2@LOWLEVEL_HDR = +@COND_TOOLKIT_PM@LOWLEVEL_HDR = COND_TOOLKIT_X11_LOWLEVEL_HDR = \ wx/generic/caret.h \ wx/unix/fontutil.h \ wx/unix/utilsx11.h \ - src/generic/timer.h \ + wx/unix/displayx11.h \ wx/x11/app.h \ wx/x11/bitmap.h \ wx/x11/brush.h \ @@ -1785,12 +1838,14 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ @COND_TOOLKIT_X11@LOWLEVEL_HDR = $(COND_TOOLKIT_X11_LOWLEVEL_HDR) @COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h @COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = wx/msw/gsockmsw.h -@COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h +@COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h @COND_TOOLKIT_MAC@NET_PLATFORM_HDR = wx/mac/gsockmac.h +@COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h @COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h @COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/glcanvas.h -@COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/motif/glcanvas.h +@COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/x11/glcanvas.h @COND_TOOLKIT_MSW@OPENGL_HDR = wx/msw/glcanvas.h +@COND_TOOLKIT_PM@OPENGL_HDR = wx/os2/glcanvas.h @COND_TOOLKIT_X11@OPENGL_HDR = wx/x11/glcanvas.h @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @@ -1801,9 +1856,9 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT) -@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wxbase$(WXBASEPORT)250 +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wxbase$(WXBASEPORT)251 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) -@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = @COND_UNICODE_1@WXUNICODEFLAG = u @@ -1825,8 +1880,8 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_MSW@ monodll_taskbarcmn.o monodll_joystick.o \ @COND_TOOLKIT_MSW@ monodll_taskbar.o monodll_wave.o -@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS = \ -@COND_TOOLKIT_OS2@ monodll_joystick.o monodll_wave.o +@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \ +@COND_TOOLKIT_PM@ monodll_joystick.o monodll_wave.o COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ monodll_joystick.o \ @@ -1850,8 +1905,8 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@ monolib_taskbarcmn.o monolib_joystick.o \ @COND_TOOLKIT_MSW@ monolib_taskbar.o monolib_wave.o -@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_OS2@ monolib_joystick.o monolib_wave.o +@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ +@COND_TOOLKIT_PM@ monolib_joystick.o monolib_wave.o COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monolib_taskbarcmn.o \ monolib_joystick.o \ @@ -1869,8 +1924,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_MSW@ advdll_taskbarcmn.o advdll_joystick.o advdll_taskbar.o \ @COND_TOOLKIT_MSW@ advdll_wave.o -@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_OS2@ advdll_joystick.o advdll_wave.o +@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_PM@ advdll_joystick.o advdll_wave.o @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_X11@ advdll_taskbarcmn.o advdll_joystick.o \ @COND_TOOLKIT_X11@ advdll_taskbarx11.o advdll_wave.o @@ -1885,8 +1940,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MSW@ advlib_taskbarcmn.o advlib_joystick.o advlib_taskbar.o \ @COND_TOOLKIT_MSW@ advlib_wave.o -@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_OS2@ advlib_joystick.o advlib_wave.o +@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_PM@ advlib_joystick.o advlib_wave.o @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_X11@ advlib_taskbarcmn.o advlib_joystick.o \ @COND_TOOLKIT_X11@ advlib_taskbarx11.o advlib_wave.o @@ -1926,12 +1981,18 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_UNIX_1@ = corelib_utilsunx.o @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \ @COND_PLATFORM_WIN32_1@ = corelib_main.o corelib_mslu.o corelib_volume.o -@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = monodll_utils.o -@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = monolib_utils.o -@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 = basedll_utils.o -@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = baselib_utils.o -@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = coredll_utils.o -@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = corelib_utils.o +@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = \ +@COND_TOOLKIT_MAC@ monodll_utils.o monodll_uma.o +@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = \ +@COND_TOOLKIT_MAC@ monolib_utils.o monolib_uma.o +@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_MAC@ basedll_utils.o basedll_uma.o +@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_MAC@ baselib_utils.o baselib_uma.o +@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = \ +@COND_TOOLKIT_MAC@ coredll_utils.o coredll_uma.o +@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = \ +@COND_TOOLKIT_MAC@ corelib_utils.o corelib_uma.o COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS = \ monodll_baseunix.o \ monodll_dir.o \ @@ -1946,9 +2007,15 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \ monodll_snglinst.o \ monodll_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS) -@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = \ -@COND_TOOLKIT_MAC@ monodll_dirmac.o monodll_mimetmac.o monodll_baseunix.o \ -@COND_TOOLKIT_MAC@ monodll_utilsexc.o +COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS = \ + monodll_dirmac.o \ + monodll_mimetmac.o \ + monodll_baseunix.o \ + monodll_utilsexc.o \ + monodll_thread.o \ + monodll_macnotfy.o \ + monodll_MoreFilesX.o +@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS) COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_baseunix.o \ monolib_dir.o \ @@ -1963,9 +2030,15 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_snglinst.o \ monolib_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1) -@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_MAC@ monolib_dirmac.o monolib_mimetmac.o monolib_baseunix.o \ -@COND_TOOLKIT_MAC@ monolib_utilsexc.o +COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 = \ + monolib_dirmac.o \ + monolib_mimetmac.o \ + monolib_baseunix.o \ + monolib_utilsexc.o \ + monolib_thread.o \ + monolib_macnotfy.o \ + monolib_MoreFilesX.o +@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1) COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_baseunix.o \ basedll_dir.o \ @@ -1980,9 +2053,15 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_snglinst.o \ basedll_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2) -@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_MAC@ basedll_dirmac.o basedll_mimetmac.o basedll_baseunix.o \ -@COND_TOOLKIT_MAC@ basedll_utilsexc.o +COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 = \ + basedll_dirmac.o \ + basedll_mimetmac.o \ + basedll_baseunix.o \ + basedll_utilsexc.o \ + basedll_thread.o \ + basedll_macnotfy.o \ + basedll_MoreFilesX.o +@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2) COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_baseunix.o \ baselib_dir.o \ @@ -1997,11 +2076,24 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_snglinst.o \ baselib_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3) -@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_MAC@ baselib_dirmac.o baselib_mimetmac.o baselib_baseunix.o \ -@COND_TOOLKIT_MAC@ baselib_utilsexc.o +COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 = \ + baselib_dirmac.o \ + baselib_mimetmac.o \ + baselib_baseunix.o \ + baselib_utilsexc.o \ + baselib_thread.o \ + baselib_macnotfy.o \ + baselib_MoreFilesX.o +@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3) @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS) +COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_dir.o \ + monodll_mimetype.o \ + monodll_thread.o \ + monodll_utils.o \ + monodll_utilsexc.o +@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_baseunix.o \ monodll_dir.o \ @@ -2024,6 +2116,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_1) +COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_dir.o \ + monolib_mimetype.o \ + monolib_thread.o \ + monolib_utils.o \ + monolib_utilsexc.o +@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_baseunix.o \ monolib_dir.o \ @@ -2046,6 +2145,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_2) +COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_dir.o \ + basedll_mimetype.o \ + basedll_thread.o \ + basedll_utils.o \ + basedll_utilsexc.o +@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_baseunix.o \ basedll_dir.o \ @@ -2068,6 +2174,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_3) +COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_dir.o \ + baselib_mimetype.o \ + baselib_thread.o \ + baselib_utils.o \ + baselib_utilsexc.o +@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_baseunix.o \ baselib_dir.o \ @@ -2096,6 +2209,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ + monodll_bookctrl.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_cmdproc.o \ @@ -2167,6 +2281,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_dcpsg.o \ monodll_dirctrlg.o \ monodll_dragimgg.o \ + monodll_listbkg.o \ monodll_logg.o \ monodll_numdlgg.o \ monodll_panelg.o \ @@ -2177,7 +2292,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_selstore.o \ monodll_spinctlg.o \ monodll_splitter.o \ - monodll_tbarsmpl.o \ monodll_textdlgg.o \ monodll_tipwin.o \ monodll_treectlg.o \ @@ -2240,6 +2354,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ + monodll_bookctrl.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_cmdproc.o \ @@ -2311,6 +2426,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_dcpsg.o \ monodll_dirctrlg.o \ monodll_dragimgg.o \ + monodll_listbkg.o \ monodll_logg.o \ monodll_numdlgg.o \ monodll_panelg.o \ @@ -2321,7 +2437,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_selstore.o \ monodll_spinctlg.o \ monodll_splitter.o \ - monodll_tbarsmpl.o \ monodll_textdlgg.o \ monodll_tipwin.o \ monodll_treectlg.o \ @@ -2336,6 +2451,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ + monolib_bookctrl.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_cmdproc.o \ @@ -2407,6 +2523,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_dcpsg.o \ monolib_dirctrlg.o \ monolib_dragimgg.o \ + monolib_listbkg.o \ monolib_logg.o \ monolib_numdlgg.o \ monolib_panelg.o \ @@ -2417,7 +2534,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_selstore.o \ monolib_spinctlg.o \ monolib_splitter.o \ - monolib_tbarsmpl.o \ monolib_textdlgg.o \ monolib_tipwin.o \ monolib_treectlg.o \ @@ -2480,6 +2596,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ + monolib_bookctrl.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_cmdproc.o \ @@ -2551,6 +2668,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_dcpsg.o \ monolib_dirctrlg.o \ monolib_dragimgg.o \ + monolib_listbkg.o \ monolib_logg.o \ monolib_numdlgg.o \ monolib_panelg.o \ @@ -2561,7 +2679,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_selstore.o \ monolib_spinctlg.o \ monolib_splitter.o \ - monolib_tbarsmpl.o \ monolib_textdlgg.o \ monolib_tipwin.o \ monolib_treectlg.o \ @@ -2576,6 +2693,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ + coredll_bookctrl.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_cmdproc.o \ @@ -2647,6 +2765,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_dcpsg.o \ coredll_dirctrlg.o \ coredll_dragimgg.o \ + coredll_listbkg.o \ coredll_logg.o \ coredll_numdlgg.o \ coredll_panelg.o \ @@ -2657,7 +2776,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_selstore.o \ coredll_spinctlg.o \ coredll_splitter.o \ - coredll_tbarsmpl.o \ coredll_textdlgg.o \ coredll_tipwin.o \ coredll_treectlg.o \ @@ -2720,6 +2838,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ + coredll_bookctrl.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_cmdproc.o \ @@ -2791,6 +2910,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_dcpsg.o \ coredll_dirctrlg.o \ coredll_dragimgg.o \ + coredll_listbkg.o \ coredll_logg.o \ coredll_numdlgg.o \ coredll_panelg.o \ @@ -2801,7 +2921,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_selstore.o \ coredll_spinctlg.o \ coredll_splitter.o \ - coredll_tbarsmpl.o \ coredll_textdlgg.o \ coredll_tipwin.o \ coredll_treectlg.o \ @@ -2816,6 +2935,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ + corelib_bookctrl.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_cmdproc.o \ @@ -2887,6 +3007,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_dcpsg.o \ corelib_dirctrlg.o \ corelib_dragimgg.o \ + corelib_listbkg.o \ corelib_logg.o \ corelib_numdlgg.o \ corelib_panelg.o \ @@ -2897,7 +3018,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_selstore.o \ corelib_spinctlg.o \ corelib_splitter.o \ - corelib_tbarsmpl.o \ corelib_textdlgg.o \ corelib_tipwin.o \ corelib_treectlg.o \ @@ -2960,6 +3080,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ + corelib_bookctrl.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_cmdproc.o \ @@ -3031,6 +3152,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_dcpsg.o \ corelib_dirctrlg.o \ corelib_dragimgg.o \ + corelib_listbkg.o \ corelib_logg.o \ corelib_numdlgg.o \ corelib_panelg.o \ @@ -3041,7 +3163,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_selstore.o \ corelib_spinctlg.o \ corelib_splitter.o \ - corelib_tbarsmpl.o \ corelib_textdlgg.o \ corelib_tipwin.o \ corelib_treectlg.o \ @@ -3054,6 +3175,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_NSControl.o \ monodll_NSMenu.o \ monodll_NSPanel.o \ + monodll_NSTableView.o \ monodll_NSTextField.o \ monodll_NSView.o \ monodll_NSWindow.o \ @@ -3077,6 +3199,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_dcmemory.o \ monodll_dcscreen.o \ monodll_dialog.o \ + monodll_evtloop.o \ monodll_font.o \ monodll_fontenum.o \ monodll_fontutil.o \ @@ -3086,6 +3209,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_icon.o \ monodll_listbox.o \ monodll_main.o \ + monodll_mbarman.o \ monodll_menu.o \ monodll_menuitem.o \ monodll_pen.o \ @@ -3147,7 +3271,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS = \ monodll_listbox.o \ monodll_mdi.o \ monodll_menu.o \ - monodll_minifram.o \ monodll_msgdlg.o \ monodll_notebook.o \ monodll_radiobox.o \ @@ -3203,13 +3326,11 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_gdiobj.o \ monodll_icon.o \ monodll_listbox.o \ - monodll_macnotfy.o \ monodll_mdi.o \ monodll_menu.o \ monodll_menuitem.o \ monodll_metafile.o \ monodll_minifram.o \ - monodll_MoreFilesX.o \ monodll_msgdlg.o \ monodll_notebmac.o \ monodll_palette.o \ @@ -3232,12 +3353,10 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_stattext.o \ monodll_tabctrl.o \ monodll_textctrl.o \ - monodll_thread.o \ monodll_timer.o \ monodll_toolbar.o \ monodll_tooltip.o \ monodll_toplevel.o \ - monodll_uma.o \ monodll_window.o \ monodll_caret.o \ monodll_fdrepdlg.o \ @@ -3287,6 +3406,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_minifram.o \ monodll_msgdlg.o \ monodll_palette.o \ + monodll_popupwin.o \ monodll_radiobox.o \ monodll_radiobut.o \ monodll_scrolbar.o \ @@ -3302,6 +3422,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_toplevel.o \ monodll_utils.o \ monodll_window.o \ + monodll_xmcombo.o \ monodll_colrdlgg.o \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ @@ -3316,6 +3437,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_statusbr.o \ + monodll_prntdlgg.o \ monodll_accel.o \ monodll_bmpbuttn.o \ monodll_button.o \ @@ -3362,8 +3484,17 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_tglbtn.o \ monodll_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS) -COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ +COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_caret.o \ + monodll_colrdlgg.o \ + monodll_dirdlgg.o \ + monodll_fdrepdlg.o \ + monodll_imaglist.o \ + monodll_listctrl.o \ + monodll_mdig.o \ + monodll_msgdlgg.o \ + monodll_prntdlgg.o \ + monodll_statusbr.o \ monodll_accel.o \ monodll_app.o \ monodll_bitmap.o \ @@ -3387,6 +3518,7 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ monodll_dcscreen.o \ monodll_dialog.o \ monodll_dnd.o \ + monodll_evtloop.o \ monodll_filedlg.o \ monodll_font.o \ monodll_fontdlg.o \ @@ -3396,7 +3528,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ monodll_gauge.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ - monodll_gsocket.o \ monodll_gsockpm.o \ monodll_helpwin.o \ monodll_icon.o \ @@ -3406,7 +3537,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ monodll_menu.o \ monodll_menuitem.o \ monodll_metafile.o \ - monodll_mimetype.o \ monodll_msgdlg.o \ monodll_nativdlg.o \ monodll_notebook.o \ @@ -3428,19 +3558,20 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ monodll_stattext.o \ monodll_tabctrl.o \ monodll_textctrl.o \ - monodll_thread.o \ monodll_timer.o \ monodll_toolbar.o \ monodll_tooltip.o \ monodll_toplevel.o \ + monodll_utilsgui.o \ monodll_window.o -@COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS) +@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_NSBox.o \ monolib_NSButton.o \ monolib_NSControl.o \ monolib_NSMenu.o \ monolib_NSPanel.o \ + monolib_NSTableView.o \ monolib_NSTextField.o \ monolib_NSView.o \ monolib_NSWindow.o \ @@ -3464,6 +3595,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_dcmemory.o \ monolib_dcscreen.o \ monolib_dialog.o \ + monolib_evtloop.o \ monolib_font.o \ monolib_fontenum.o \ monolib_fontutil.o \ @@ -3473,6 +3605,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_icon.o \ monolib_listbox.o \ monolib_main.o \ + monolib_mbarman.o \ monolib_menu.o \ monolib_menuitem.o \ monolib_pen.o \ @@ -3534,7 +3667,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 = \ monolib_listbox.o \ monolib_mdi.o \ monolib_menu.o \ - monolib_minifram.o \ monolib_msgdlg.o \ monolib_notebook.o \ monolib_radiobox.o \ @@ -3590,13 +3722,11 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_gdiobj.o \ monolib_icon.o \ monolib_listbox.o \ - monolib_macnotfy.o \ monolib_mdi.o \ monolib_menu.o \ monolib_menuitem.o \ monolib_metafile.o \ monolib_minifram.o \ - monolib_MoreFilesX.o \ monolib_msgdlg.o \ monolib_notebmac.o \ monolib_palette.o \ @@ -3619,12 +3749,10 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_stattext.o \ monolib_tabctrl.o \ monolib_textctrl.o \ - monolib_thread.o \ monolib_timer.o \ monolib_toolbar.o \ monolib_tooltip.o \ monolib_toplevel.o \ - monolib_uma.o \ monolib_window.o \ monolib_caret.o \ monolib_fdrepdlg.o \ @@ -3674,6 +3802,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_minifram.o \ monolib_msgdlg.o \ monolib_palette.o \ + monolib_popupwin.o \ monolib_radiobox.o \ monolib_radiobut.o \ monolib_scrolbar.o \ @@ -3689,6 +3818,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_toplevel.o \ monolib_utils.o \ monolib_window.o \ + monolib_xmcombo.o \ monolib_colrdlgg.o \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ @@ -3703,6 +3833,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_statusbr.o \ + monolib_prntdlgg.o \ monolib_accel.o \ monolib_bmpbuttn.o \ monolib_button.o \ @@ -3749,8 +3880,17 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_tglbtn.o \ monolib_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1) -COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ +COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_caret.o \ + monolib_colrdlgg.o \ + monolib_dirdlgg.o \ + monolib_fdrepdlg.o \ + monolib_imaglist.o \ + monolib_listctrl.o \ + monolib_mdig.o \ + monolib_msgdlgg.o \ + monolib_prntdlgg.o \ + monolib_statusbr.o \ monolib_accel.o \ monolib_app.o \ monolib_bitmap.o \ @@ -3774,6 +3914,7 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ monolib_dcscreen.o \ monolib_dialog.o \ monolib_dnd.o \ + monolib_evtloop.o \ monolib_filedlg.o \ monolib_font.o \ monolib_fontdlg.o \ @@ -3783,7 +3924,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ monolib_gauge.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ - monolib_gsocket.o \ monolib_gsockpm.o \ monolib_helpwin.o \ monolib_icon.o \ @@ -3793,7 +3933,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ monolib_menu.o \ monolib_menuitem.o \ monolib_metafile.o \ - monolib_mimetype.o \ monolib_msgdlg.o \ monolib_nativdlg.o \ monolib_notebook.o \ @@ -3815,19 +3954,20 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ monolib_stattext.o \ monolib_tabctrl.o \ monolib_textctrl.o \ - monolib_thread.o \ monolib_timer.o \ monolib_toolbar.o \ monolib_tooltip.o \ monolib_toplevel.o \ + monolib_utilsgui.o \ monolib_window.o -@COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1) +@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_NSBox.o \ coredll_NSButton.o \ coredll_NSControl.o \ coredll_NSMenu.o \ coredll_NSPanel.o \ + coredll_NSTableView.o \ coredll_NSTextField.o \ coredll_NSView.o \ coredll_NSWindow.o \ @@ -3851,6 +3991,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_dcmemory.o \ coredll_dcscreen.o \ coredll_dialog.o \ + coredll_evtloop.o \ coredll_font.o \ coredll_fontenum.o \ coredll_fontutil.o \ @@ -3860,6 +4001,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_icon.o \ coredll_listbox.o \ coredll_main.o \ + coredll_mbarman.o \ coredll_menu.o \ coredll_menuitem.o \ coredll_pen.o \ @@ -3921,7 +4063,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 = \ coredll_listbox.o \ coredll_mdi.o \ coredll_menu.o \ - coredll_minifram.o \ coredll_msgdlg.o \ coredll_notebook.o \ coredll_radiobox.o \ @@ -3977,13 +4118,11 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_gdiobj.o \ coredll_icon.o \ coredll_listbox.o \ - coredll_macnotfy.o \ coredll_mdi.o \ coredll_menu.o \ coredll_menuitem.o \ coredll_metafile.o \ coredll_minifram.o \ - coredll_MoreFilesX.o \ coredll_msgdlg.o \ coredll_notebmac.o \ coredll_palette.o \ @@ -4006,12 +4145,10 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_stattext.o \ coredll_tabctrl.o \ coredll_textctrl.o \ - coredll_thread.o \ coredll_timer.o \ coredll_toolbar.o \ coredll_tooltip.o \ coredll_toplevel.o \ - coredll_uma.o \ coredll_window.o \ coredll_caret.o \ coredll_fdrepdlg.o \ @@ -4061,6 +4198,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_minifram.o \ coredll_msgdlg.o \ coredll_palette.o \ + coredll_popupwin.o \ coredll_radiobox.o \ coredll_radiobut.o \ coredll_scrolbar.o \ @@ -4076,6 +4214,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_toplevel.o \ coredll_utils.o \ coredll_window.o \ + coredll_xmcombo.o \ coredll_colrdlgg.o \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ @@ -4090,6 +4229,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_statusbr.o \ + coredll_prntdlgg.o \ coredll_accel.o \ coredll_bmpbuttn.o \ coredll_button.o \ @@ -4136,8 +4276,17 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_tglbtn.o \ coredll_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2) -COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ +COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_caret.o \ + coredll_colrdlgg.o \ + coredll_dirdlgg.o \ + coredll_fdrepdlg.o \ + coredll_imaglist.o \ + coredll_listctrl.o \ + coredll_mdig.o \ + coredll_msgdlgg.o \ + coredll_prntdlgg.o \ + coredll_statusbr.o \ coredll_accel.o \ coredll_app.o \ coredll_bitmap.o \ @@ -4161,6 +4310,7 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ coredll_dcscreen.o \ coredll_dialog.o \ coredll_dnd.o \ + coredll_evtloop.o \ coredll_filedlg.o \ coredll_font.o \ coredll_fontdlg.o \ @@ -4170,7 +4320,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ coredll_gauge.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ - coredll_gsocket.o \ coredll_gsockpm.o \ coredll_helpwin.o \ coredll_icon.o \ @@ -4180,7 +4329,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ coredll_menu.o \ coredll_menuitem.o \ coredll_metafile.o \ - coredll_mimetype.o \ coredll_msgdlg.o \ coredll_nativdlg.o \ coredll_notebook.o \ @@ -4202,19 +4350,20 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ coredll_stattext.o \ coredll_tabctrl.o \ coredll_textctrl.o \ - coredll_thread.o \ coredll_timer.o \ coredll_toolbar.o \ coredll_tooltip.o \ coredll_toplevel.o \ + coredll_utilsgui.o \ coredll_window.o -@COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2) +@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_NSBox.o \ corelib_NSButton.o \ corelib_NSControl.o \ corelib_NSMenu.o \ corelib_NSPanel.o \ + corelib_NSTableView.o \ corelib_NSTextField.o \ corelib_NSView.o \ corelib_NSWindow.o \ @@ -4238,6 +4387,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_dcmemory.o \ corelib_dcscreen.o \ corelib_dialog.o \ + corelib_evtloop.o \ corelib_font.o \ corelib_fontenum.o \ corelib_fontutil.o \ @@ -4247,6 +4397,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_icon.o \ corelib_listbox.o \ corelib_main.o \ + corelib_mbarman.o \ corelib_menu.o \ corelib_menuitem.o \ corelib_pen.o \ @@ -4308,7 +4459,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 = \ corelib_listbox.o \ corelib_mdi.o \ corelib_menu.o \ - corelib_minifram.o \ corelib_msgdlg.o \ corelib_notebook.o \ corelib_radiobox.o \ @@ -4364,13 +4514,11 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_gdiobj.o \ corelib_icon.o \ corelib_listbox.o \ - corelib_macnotfy.o \ corelib_mdi.o \ corelib_menu.o \ corelib_menuitem.o \ corelib_metafile.o \ corelib_minifram.o \ - corelib_MoreFilesX.o \ corelib_msgdlg.o \ corelib_notebmac.o \ corelib_palette.o \ @@ -4393,12 +4541,10 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_stattext.o \ corelib_tabctrl.o \ corelib_textctrl.o \ - corelib_thread.o \ corelib_timer.o \ corelib_toolbar.o \ corelib_tooltip.o \ corelib_toplevel.o \ - corelib_uma.o \ corelib_window.o \ corelib_caret.o \ corelib_fdrepdlg.o \ @@ -4448,6 +4594,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_minifram.o \ corelib_msgdlg.o \ corelib_palette.o \ + corelib_popupwin.o \ corelib_radiobox.o \ corelib_radiobut.o \ corelib_scrolbar.o \ @@ -4463,6 +4610,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_toplevel.o \ corelib_utils.o \ corelib_window.o \ + corelib_xmcombo.o \ corelib_colrdlgg.o \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ @@ -4477,6 +4625,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_statusbr.o \ + corelib_prntdlgg.o \ corelib_accel.o \ corelib_bmpbuttn.o \ corelib_button.o \ @@ -4523,8 +4672,17 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_tglbtn.o \ corelib_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3) -COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ +COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_caret.o \ + corelib_colrdlgg.o \ + corelib_dirdlgg.o \ + corelib_fdrepdlg.o \ + corelib_imaglist.o \ + corelib_listctrl.o \ + corelib_mdig.o \ + corelib_msgdlgg.o \ + corelib_prntdlgg.o \ + corelib_statusbr.o \ corelib_accel.o \ corelib_app.o \ corelib_bitmap.o \ @@ -4548,6 +4706,7 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ corelib_dcscreen.o \ corelib_dialog.o \ corelib_dnd.o \ + corelib_evtloop.o \ corelib_filedlg.o \ corelib_font.o \ corelib_fontdlg.o \ @@ -4557,7 +4716,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ corelib_gauge.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ - corelib_gsocket.o \ corelib_gsockpm.o \ corelib_helpwin.o \ corelib_icon.o \ @@ -4567,7 +4725,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ corelib_menu.o \ corelib_menuitem.o \ corelib_metafile.o \ - corelib_mimetype.o \ corelib_msgdlg.o \ corelib_nativdlg.o \ corelib_notebook.o \ @@ -4589,16 +4746,24 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ corelib_stattext.o \ corelib_tabctrl.o \ corelib_textctrl.o \ - corelib_thread.o \ corelib_timer.o \ corelib_toolbar.o \ corelib_tooltip.o \ corelib_toplevel.o \ + corelib_utilsgui.o \ corelib_window.o -@COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3) +@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3) +@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o +@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o +@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o +@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o +@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o +@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_helpbest.o +@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o +@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o @COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @@ -4631,6 +4796,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS = \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ + monodll_displayx11.o \ monodll_paletteg.o \ monodll_app.o \ monodll_bitmap.o \ @@ -4651,6 +4817,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS = \ monodll_gsockgtk.o \ monodll_icon.o \ monodll_main.o \ + monodll_minifram.o \ monodll_pen.o \ monodll_popupwin.o \ monodll_region.o \ @@ -4699,6 +4866,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS = \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ + monodll_displayx11.o \ monodll_bitmap.o \ monodll_brush.o \ monodll_pen.o \ @@ -4756,13 +4924,14 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_uxtheme.o \ monodll_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) -@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS = +@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS = COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_caret.o \ monodll_dialup.o \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ + monodll_displayx11.o \ monodll_timer.o \ monodll_app.o \ monodll_bitmap.o \ @@ -4802,6 +4971,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 = \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ + monolib_displayx11.o \ monolib_paletteg.o \ monolib_app.o \ monolib_bitmap.o \ @@ -4822,6 +4992,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 = \ monolib_gsockgtk.o \ monolib_icon.o \ monolib_main.o \ + monolib_minifram.o \ monolib_pen.o \ monolib_popupwin.o \ monolib_region.o \ @@ -4870,6 +5041,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 = \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ + monolib_displayx11.o \ monolib_bitmap.o \ monolib_brush.o \ monolib_pen.o \ @@ -4927,13 +5099,14 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 = \ monolib_uxtheme.o \ monolib_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0) -@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = +@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_0 = COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ monolib_caret.o \ monolib_dialup.o \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ + monolib_displayx11.o \ monolib_timer.o \ monolib_app.o \ monolib_bitmap.o \ @@ -4973,6 +5146,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ + coredll_displayx11.o \ coredll_paletteg.o \ coredll_app.o \ coredll_bitmap.o \ @@ -4993,6 +5167,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_gsockgtk.o \ coredll_icon.o \ coredll_main.o \ + coredll_minifram.o \ coredll_pen.o \ coredll_popupwin.o \ coredll_region.o \ @@ -5041,6 +5216,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ + coredll_displayx11.o \ coredll_bitmap.o \ coredll_brush.o \ coredll_pen.o \ @@ -5098,13 +5274,14 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_uxtheme.o \ coredll_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8) -@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = +@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_8 = COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_caret.o \ coredll_dialup.o \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ + coredll_displayx11.o \ coredll_timer.o \ coredll_app.o \ coredll_bitmap.o \ @@ -5144,6 +5321,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_fontenum.o \ corelib_fontutil.o \ corelib_utilsx11.o \ + corelib_displayx11.o \ corelib_paletteg.o \ corelib_app.o \ corelib_bitmap.o \ @@ -5164,6 +5342,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_gsockgtk.o \ corelib_icon.o \ corelib_main.o \ + corelib_minifram.o \ corelib_pen.o \ corelib_popupwin.o \ corelib_region.o \ @@ -5212,6 +5391,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_fontenum.o \ corelib_fontutil.o \ corelib_utilsx11.o \ + corelib_displayx11.o \ corelib_bitmap.o \ corelib_brush.o \ corelib_pen.o \ @@ -5269,13 +5449,14 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_uxtheme.o \ corelib_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9) -@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_9 = +@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_9 = COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_caret.o \ corelib_dialup.o \ corelib_fontenum.o \ corelib_fontutil.o \ corelib_utilsx11.o \ + corelib_displayx11.o \ corelib_timer.o \ corelib_app.o \ corelib_bitmap.o \ @@ -5402,31 +5583,38 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MAC@__NET_MACOSX_SRC_OBJECTS_3 = netlib_gsocket.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS) +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_1) +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_2) +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_3) +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o +@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o +@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o +@COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o @COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = \ @@ -5444,30 +5632,30 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname) COND_PLATFORM_WIN32_1___advdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__advdll___importlib = $(COND_PLATFORM_WIN32_1___advdll___importlib) COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd) COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___advdll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5478,7 +5666,7 @@ COND_USE_SOVERSOLARIS_1___advdll___soname_flags = \ @COND_GCC_PCH_1@__advlib_PCH_DEP = .pch/wxprec_advlib/wx/wxprec.h.gch @COND_GCC_PCH_1@__advlib_PCH_INC = -I.pch/wxprec_advlib COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \ - $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname) @COND_GCC_PCH_1@__basedll_PCH_DEP = .pch/wxprec_basedll/wx/wxprec.h.gch @COND_GCC_PCH_1@__basedll_PCH_INC = -I.pch/wxprec_basedll @@ -5486,30 +5674,30 @@ COND_MONOLITHIC_0_SHARED_1___basedll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname) COND_PLATFORM_WIN32_1___basedll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__basedll___importlib = $(COND_PLATFORM_WIN32_1___basedll___importlib) COND_PLATFORM_MACOSX_1___basedll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__basedll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___basedll___macinstnamecmd) COND_USE_SOSYMLINKS_1___basedll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd = rm -f \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___basedll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5520,9 +5708,9 @@ COND_USE_SOVERSOLARIS_1___basedll___soname_flags = \ @COND_GCC_PCH_1@__baselib_PCH_DEP = .pch/wxprec_baselib/wx/wxprec.h.gch @COND_GCC_PCH_1@__baselib_PCH_INC = -I.pch/wxprec_baselib COND_MONOLITHIC_0_SHARED_0___baselib___depname = \ - $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname) -@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_GCC_PCH_1@__coredll_PCH_DEP = .pch/wxprec_coredll/wx/wxprec.h.gch @COND_GCC_PCH_1@__coredll_PCH_INC = -I.pch/wxprec_coredll @@ -5530,30 +5718,30 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__coredll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname) COND_PLATFORM_WIN32_1___coredll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__coredll___importlib = $(COND_PLATFORM_WIN32_1___coredll___importlib) COND_PLATFORM_MACOSX_1___coredll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__coredll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___coredll___macinstnamecmd) COND_USE_SOSYMLINKS_1___coredll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__coredll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___coredll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__coredll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___coredll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5564,7 +5752,7 @@ COND_USE_SOVERSOLARIS_1___coredll___soname_flags = \ @COND_GCC_PCH_1@__corelib_PCH_DEP = .pch/wxprec_corelib/wx/wxprec.h.gch @COND_GCC_PCH_1@__corelib_PCH_INC = -I.pch/wxprec_corelib COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ - $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname) @COND_GCC_PCH_1@__dbgriddll_PCH_DEP = .pch/wxprec_dbgriddll/wx/wxprec.h.gch @COND_GCC_PCH_1@__dbgriddll_PCH_INC = -I.pch/wxprec_dbgriddll @@ -5572,30 +5760,30 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname) COND_PLATFORM_WIN32_1___dbgriddll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__dbgriddll___importlib = $(COND_PLATFORM_WIN32_1___dbgriddll___importlib) COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__dbgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd) COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___dbgriddll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5606,7 +5794,7 @@ COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags = \ @COND_GCC_PCH_1@__dbgridlib_PCH_DEP = .pch/wxprec_dbgridlib/wx/wxprec.h.gch @COND_GCC_PCH_1@__dbgridlib_PCH_INC = -I.pch/wxprec_dbgridlib COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \ - $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__dbgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname) @COND_GCC_PCH_1@__gldll_PCH_DEP = .pch/wxprec_gldll/wx/wxprec.h.gch @COND_GCC_PCH_1@__gldll_PCH_INC = -I.pch/wxprec_gldll @@ -5614,30 +5802,30 @@ COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname) COND_PLATFORM_WIN32_1___gldll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__gldll___importlib = $(COND_PLATFORM_WIN32_1___gldll___importlib) COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd) COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___gldll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5648,7 +5836,7 @@ COND_USE_SOVERSOLARIS_1___gldll___soname_flags = \ @COND_GCC_PCH_1@__gllib_PCH_DEP = .pch/wxprec_gllib/wx/wxprec.h.gch @COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \ - $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__gllib___depname = $(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname) @COND_GCC_PCH_1@__htmldll_PCH_DEP = .pch/wxprec_htmldll/wx/wxprec.h.gch @COND_GCC_PCH_1@__htmldll_PCH_INC = -I.pch/wxprec_htmldll @@ -5656,30 +5844,30 @@ COND_MONOLITHIC_0_SHARED_1_USE_HTML_1___htmldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1___htmldll___depname) COND_PLATFORM_WIN32_1___htmldll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__htmldll___importlib = $(COND_PLATFORM_WIN32_1___htmldll___importlib) COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd) COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___htmldll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5690,7 +5878,7 @@ COND_USE_SOVERSOLARIS_1___htmldll___soname_flags = \ @COND_GCC_PCH_1@__htmllib_PCH_DEP = .pch/wxprec_htmllib/wx/wxprec.h.gch @COND_GCC_PCH_1@__htmllib_PCH_INC = -I.pch/wxprec_htmllib COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ - $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll @@ -5720,10 +5908,10 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ @COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib @COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll @COND_MONOLITHIC_0_SHARED_0@__install_netlib___depname = install_netlib -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_odbcdll___depname \ -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ = install_odbcdll -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_odbclib___depname \ -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ = install_odbclib +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \ +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ = install_odbcdll +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__install_odbclib___depname \ +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@ = install_odbclib @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname \ @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ = install_wxexpat @COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \ @@ -5740,7 +5928,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ @COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ = install_wxzlib @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll @COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib -@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r @COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install @COND_GCC_PCH_1@__monodll_PCH_DEP = .pch/wxprec_monodll/wx/wxprec.h.gch @COND_GCC_PCH_1@__monodll_PCH_INC = -I.pch/wxprec_monodll @@ -5748,30 +5936,30 @@ COND_MONOLITHIC_1_SHARED_1___monodll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_1_SHARED_1@__monodll___depname = $(COND_MONOLITHIC_1_SHARED_1___monodll___depname) COND_PLATFORM_WIN32_1___monodll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__monodll___importlib = $(COND_PLATFORM_WIN32_1___monodll___importlib) COND_PLATFORM_MACOSX_1___monodll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__monodll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___monodll___macinstnamecmd) COND_USE_SOSYMLINKS_1___monodll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___monodll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5782,7 +5970,7 @@ COND_USE_SOVERSOLARIS_1___monodll___soname_flags = \ @COND_GCC_PCH_1@__monolib_PCH_DEP = .pch/wxprec_monolib/wx/wxprec.h.gch @COND_GCC_PCH_1@__monolib_PCH_INC = -I.pch/wxprec_monolib COND_MONOLITHIC_1_SHARED_0___monolib___depname = \ - $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname) @COND_GCC_PCH_1@__netdll_PCH_DEP = .pch/wxprec_netdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__netdll_PCH_INC = -I.pch/wxprec_netdll @@ -5790,30 +5978,30 @@ COND_MONOLITHIC_0_SHARED_1___netdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname) COND_PLATFORM_WIN32_1___netdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__netdll___importlib = $(COND_PLATFORM_WIN32_1___netdll___importlib) COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__netdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd) COND_USE_SOSYMLINKS_1___netdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd = rm -f \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___netdll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5824,38 +6012,38 @@ COND_USE_SOVERSOLARIS_1___netdll___soname_flags = \ @COND_GCC_PCH_1@__netlib_PCH_DEP = .pch/wxprec_netlib/wx/wxprec.h.gch @COND_GCC_PCH_1@__netlib_PCH_INC = -I.pch/wxprec_netlib COND_MONOLITHIC_0_SHARED_0___netlib___depname = \ - $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0@__netlib___depname = $(COND_MONOLITHIC_0_SHARED_0___netlib___depname) @COND_GCC_PCH_1@__odbcdll_PCH_DEP = .pch/wxprec_odbcdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__odbcdll_PCH_INC = -I.pch/wxprec_odbcdll -COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___odbcdll___depname = \ +COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___odbcdll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname) COND_PLATFORM_WIN32_1___odbcdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__odbcdll___importlib = $(COND_PLATFORM_WIN32_1___odbcdll___importlib) COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__odbcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd) COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd = rm -f \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___odbcdll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5865,56 +6053,56 @@ COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags = \ @COND_USE_SOVERSOLARIS_1@__odbcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags) @COND_GCC_PCH_1@__odbclib_PCH_DEP = .pch/wxprec_odbclib/wx/wxprec.h.gch @COND_GCC_PCH_1@__odbclib_PCH_INC = -I.pch/wxprec_odbclib -COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname = \ - $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname) +COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname = \ + $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname) @COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = \ -@COND_WXUSE_EXPAT_BUILTIN@ $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a +@COND_WXUSE_EXPAT_BUILTIN@ $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__wxjpeg___depname \ @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(LIBDIRNAME)/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_WXUSE_ODBC_BUILTIN@__wxodbc___depname = \ -@COND_WXUSE_ODBC_BUILTIN@ $(LIBDIRNAME)/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a +@COND_WXUSE_ODBC_BUILTIN@ $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__wxpng___depname \ @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(LIBDIRNAME)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_WXUSE_REGEX_BUILTIN@__wxregex___depname = \ -@COND_WXUSE_REGEX_BUILTIN@ $(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a +@COND_WXUSE_REGEX_BUILTIN@ $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__wxtiff___depname \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(LIBDIRNAME)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_WXUSE_ZLIB_BUILTIN@__wxzlib___depname = \ -@COND_WXUSE_ZLIB_BUILTIN@ $(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a +@COND_WXUSE_ZLIB_BUILTIN@ $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_GCC_PCH_1@__xmldll_PCH_DEP = .pch/wxprec_xmldll/wx/wxprec.h.gch @COND_GCC_PCH_1@__xmldll_PCH_INC = -I.pch/wxprec_xmldll COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname) COND_PLATFORM_WIN32_1___xmldll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__xmldll___importlib = $(COND_PLATFORM_WIN32_1___xmldll___importlib) COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__xmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd) COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd = rm -f \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___xmldll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -5925,18 +6113,18 @@ COND_USE_SOVERSOLARIS_1___xmldll___soname_flags = \ @COND_GCC_PCH_1@__xmllib_PCH_DEP = .pch/wxprec_xmllib/wx/wxprec.h.gch @COND_GCC_PCH_1@__xmllib_PCH_INC = -I.pch/wxprec_xmllib COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \ - $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0@__xmllib___depname = $(COND_MONOLITHIC_0_SHARED_0___xmllib___depname) @COND_PLATFORM_MACOSX_1@dll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).1.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) ### Targets: ### @@ -6004,7 +6192,8 @@ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpe @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__advdll_PCH_DEP) $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd) advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @@ -6040,8 +6229,8 @@ advdll_helpext.o: $(srcdir)/src/generic/helpext.cpp @COND_TOOLKIT_X11@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp -@COND_TOOLKIT_OS2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp +@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< advdll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -6079,8 +6268,8 @@ advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2@advdll_wave.o: $(srcdir)/src/os2/wave.cpp -@COND_TOOLKIT_OS2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM@advdll_wave.o: $(srcdir)/src/os2/wave.cpp +@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW@advdll_wave.o: $(srcdir)/src/msw/wave.cpp @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -6100,7 +6289,7 @@ advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a: $(__advlib_PCH_DEP) $(ADVLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a: $(__advlib_PCH_DEP) $(ADVLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(ADVLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ @@ -6138,8 +6327,8 @@ advlib_helpext.o: $(srcdir)/src/generic/helpext.cpp @COND_TOOLKIT_X11@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp -@COND_TOOLKIT_OS2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp +@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< advlib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -6177,8 +6366,8 @@ advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2@advlib_wave.o: $(srcdir)/src/os2/wave.cpp -@COND_TOOLKIT_OS2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM@advlib_wave.o: $(srcdir)/src/os2/wave.cpp +@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW@advlib_wave.o: $(srcdir)/src/msw/wave.cpp @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -6200,8 +6389,12 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__basedll_PCH_DEP) $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__LIB_EXPAT_p) $(EXTRALIBS) +@COND_MONOLITHIC_0_SHARED_1@ @COND_MONOLITHIC_0_SHARED_1@ $(__basedll___so_symlinks_cmd) +basedll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c + $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< + basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6250,6 +6443,9 @@ basedll_dde.o: $(srcdir)/src/msw/dde.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_dir.o: $(srcdir)/src/unix/dir.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_dir.o: $(srcdir)/src/os2/dir.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@basedll_dir.o: $(srcdir)/src/msw/dir.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6304,6 +6500,9 @@ basedll_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp basedll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +basedll_gzstream.o: $(srcdir)/src/common/gzstream.cpp + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + basedll_hash.o: $(srcdir)/src/common/hash.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6328,6 +6527,9 @@ basedll_log.o: $(srcdir)/src/common/log.cpp basedll_longlong.o: $(srcdir)/src/common/longlong.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +basedll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + basedll_main.o: $(srcdir)/src/msw/main.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6352,6 +6554,9 @@ basedll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + basedll_module.o: $(srcdir)/src/common/module.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6412,8 +6617,14 @@ basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp basedll_textfile.o: $(srcdir)/src/common/textfile.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_thread.o: $(srcdir)/src/msw/thread.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_WIN32_1@basedll_thread.o: $(srcdir)/src/msw/thread.cpp +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +@COND_PLATFORM_OS2_1@basedll_thread.o: $(srcdir)/src/os2/thread.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_thread.o: $(srcdir)/src/mac/thread.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6430,12 +6641,18 @@ basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +basedll_uma.o: $(srcdir)/src/mac/uma.cpp + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + basedll_unzip.o: $(srcdir)/src/common/unzip.c $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< @COND_TOOLKIT_MAC@basedll_utils.o: $(srcdir)/src/mac/utils.cpp @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_utils.o: $(srcdir)/src/os2/utils.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@basedll_utils.o: $(srcdir)/src/msw/utils.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6445,6 +6662,9 @@ basedll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_PLATFORM_WIN32_1@basedll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6466,17 +6686,26 @@ basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp basedll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +basedll_xti.o: $(srcdir)/src/common/xti.cpp + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +basedll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(__baselib_PCH_DEP) $(BASELIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(__baselib_PCH_DEP) $(BASELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(BASELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ +baselib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c + $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< + baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6525,6 +6754,9 @@ baselib_dde.o: $(srcdir)/src/msw/dde.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_dir.o: $(srcdir)/src/unix/dir.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_dir.o: $(srcdir)/src/os2/dir.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@baselib_dir.o: $(srcdir)/src/msw/dir.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6579,6 +6811,9 @@ baselib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp baselib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +baselib_gzstream.o: $(srcdir)/src/common/gzstream.cpp + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + baselib_hash.o: $(srcdir)/src/common/hash.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6603,6 +6838,9 @@ baselib_log.o: $(srcdir)/src/common/log.cpp baselib_longlong.o: $(srcdir)/src/common/longlong.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +baselib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + baselib_main.o: $(srcdir)/src/msw/main.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6627,6 +6865,9 @@ baselib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + baselib_module.o: $(srcdir)/src/common/module.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6687,8 +6928,14 @@ baselib_textbuf.o: $(srcdir)/src/common/textbuf.cpp baselib_textfile.o: $(srcdir)/src/common/textfile.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_thread.o: $(srcdir)/src/msw/thread.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_WIN32_1@baselib_thread.o: $(srcdir)/src/msw/thread.cpp +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + +@COND_PLATFORM_OS2_1@baselib_thread.o: $(srcdir)/src/os2/thread.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_thread.o: $(srcdir)/src/mac/thread.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6705,12 +6952,18 @@ baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +baselib_uma.o: $(srcdir)/src/mac/uma.cpp + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + baselib_unzip.o: $(srcdir)/src/common/unzip.c $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< @COND_TOOLKIT_MAC@baselib_utils.o: $(srcdir)/src/mac/utils.cpp @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_utils.o: $(srcdir)/src/os2/utils.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@baselib_utils.o: $(srcdir)/src/msw/utils.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6720,6 +6973,9 @@ baselib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_PLATFORM_WIN32_1@baselib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6741,6 +6997,12 @@ baselib_wfstream.o: $(srcdir)/src/common/wfstream.cpp baselib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +baselib_xti.o: $(srcdir)/src/common/xti.cpp + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + +baselib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + baselib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6750,72 +7012,70 @@ baselib_zstream.o: $(srcdir)/src/common/zstream.cpp clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a - rm -f $(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a - rm -f $(LIBDIRNAME)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a - rm -f $(LIBDIRNAME)/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a - rm -f $(LIBDIRNAME)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a - rm -f $(LIBDIRNAME)/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a - rm -f $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a (cd samples && $(MAKE) clean) - rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r - rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r + rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r + rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r -@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r: -@COND_TOOLKIT_COCOA@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).1.r: +@COND_TOOLKIT_COCOA@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc +@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r @COND_TOOLKIT_COCOA@cocoa-res-install: $(__macos_res___depname) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir) +@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir) +@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__coredll_PCH_DEP) $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd) -coredll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< - coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6831,6 +7091,9 @@ coredll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm coredll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6855,8 +7118,8 @@ coredll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm @COND_USE_GUI_1_WXUNIV_1@coredll_accel.o: $(srcdir)/src/generic/accel.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/os2/accel.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/os2/accel.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/motif/accel.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6879,8 +7142,8 @@ coredll_aga.o: $(srcdir)/src/mac/aga.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_app.o: $(srcdir)/src/msw/app.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/os2/app.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/os2/app.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_app.o: $(srcdir)/src/gtk/app.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6912,8 +7175,8 @@ coredll_aga.o: $(srcdir)/src/mac/aga.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6951,14 +7214,17 @@ coredll_aga.o: $(srcdir)/src/mac/aga.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/os2/brush.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/os2/brush.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_brush.o: $(srcdir)/src/gtk/brush.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6984,8 +7250,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_USE_GUI_1@coredll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/os2/button.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/os2/button.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/msw/button.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7011,8 +7277,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7029,8 +7295,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_caret.o: $(srcdir)/src/msw/caret.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7053,8 +7319,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/mac/checklst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/os2/checklst.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/os2/checklst.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@coredll_checklst.o: $(srcdir)/src/univ/checklst.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7077,8 +7343,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_USE_GUI_1@coredll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/os2/choice.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/os2/choice.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/motif/choice.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7113,8 +7379,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_X11_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7143,8 +7409,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_X11_USE_GUI_1@coredll_colour.o: $(srcdir)/src/x11/colour.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/os2/colour.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/os2/colour.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/mac/colour.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7170,14 +7436,17 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_colschem.o: $(srcdir)/src/univ/colschem.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/os2/combobox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/os2/combobox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@coredll_combobox.o: $(srcdir)/src/univ/combobox.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7221,8 +7490,8 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/msw/control.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/os2/control.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/os2/control.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_cshelp.o: $(srcdir)/src/common/cshelp.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7245,8 +7514,8 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/msw/cursor.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/os2/cursor.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/os2/cursor.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/x11/cursor.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7263,8 +7532,8 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/motif/data.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/os2/data.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/os2/data.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@coredll_data.o: $(srcdir)/src/x11/data.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7302,8 +7571,8 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_X11_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/x11/dataobj.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7329,8 +7598,8 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/motif/dc.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/os2/dc.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/os2/dc.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7344,8 +7613,8 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/os2/dcclient.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/os2/dcclient.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7377,14 +7646,14 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/mac/dcmemory.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/mac/dcprint.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7395,8 +7664,8 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_USE_GUI_1@coredll_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7422,8 +7691,8 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/motif/dialog.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/os2/dialog.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/os2/dialog.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/mac/dialog.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7473,6 +7742,9 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7482,11 +7754,20 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dnd.o: $(srcdir)/src/os2/dnd.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dnd.o: $(srcdir)/src/os2/dnd.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_dnd.o: $(srcdir)/src/gtk/dnd.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7536,6 +7817,15 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_GTK_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7545,9 +7835,6 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7566,14 +7853,17 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/mac/filedlg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7605,8 +7895,8 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/mac/font.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/os2/font.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/os2/font.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/motif/font.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7620,8 +7910,8 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/mac/fontdlg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7665,14 +7955,14 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/os2/fontenum.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/os2/fontenum.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_fontmap.o: $(srcdir)/src/common/fontmap.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7704,8 +7994,8 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/mac/frame.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/os2/frame.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/os2/frame.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/gtk/frame.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7734,8 +8024,8 @@ coredll_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp @COND_USE_GUI_1_WXUNIV_1@coredll_gauge.o: $(srcdir)/src/univ/gauge.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/os2/gauge.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/os2/gauge.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/mac/gauge.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7749,8 +8039,8 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@coredll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7764,8 +8054,8 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_TOOLKIT_X11_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7785,9 +8075,6 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@coredll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c @COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< @@ -7812,8 +8099,8 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7824,8 +8111,8 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/motif/icon.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/os2/icon.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/os2/icon.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_icon.o: $(srcdir)/src/msw/icon.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7878,6 +8165,9 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7899,8 +8189,8 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_USE_GUI_1@coredll_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/os2/iniconf.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/os2/iniconf.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7917,8 +8207,11 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_USE_GUI_1@coredll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/os2/listbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1@coredll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/os2/listbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/motif/listbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7953,17 +8246,17 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_logg.o: $(srcdir)/src/generic/logg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/os2/main.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/os2/main.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/motif/main.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7983,6 +8276,9 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_USE_GUI_1@coredll_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/mac/mdi.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7998,6 +8294,9 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8010,8 +8309,8 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/mac/menu.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/os2/menu.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/os2/menu.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/gtk/menu.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8031,8 +8330,8 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/os2/menuitem.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/os2/menuitem.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8046,20 +8345,17 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/mac/metafile.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/os2/metafile.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/os2/metafile.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/gtk/minifram.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/gtk/minifram.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/msw/minifram.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8082,8 +8378,8 @@ coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8091,6 +8387,9 @@ coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8103,8 +8402,8 @@ coredll_mslu.o: $(srcdir)/src/msw/mslu.cpp @COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8121,8 +8420,8 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/msw/notebook.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/os2/notebook.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/os2/notebook.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/generic/notebook.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8142,8 +8441,8 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_palette.o: $(srcdir)/src/mac/palette.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8154,8 +8453,8 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MGL_USE_GUI_1@coredll_palette.o: $(srcdir)/src/mgl/palette.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_palette.o: $(srcdir)/src/os2/palette.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_palette.o: $(srcdir)/src/os2/palette.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_palette.o: $(srcdir)/src/motif/palette.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8175,8 +8474,8 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/os2/pen.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/os2/pen.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_pen.o: $(srcdir)/src/msw/pen.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8214,6 +8513,9 @@ coredll_pnghand.o: $(srcdir)/src/mac/pnghand.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_print.o: $(srcdir)/src/os2/print.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8241,9 +8543,15 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8259,8 +8567,8 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/os2/radiobox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/os2/radiobox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/motif/radiobox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8280,8 +8588,8 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_USE_GUI_1_WXUNIV_1@coredll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/motif/radiobut.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8316,8 +8624,8 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_region.o: $(srcdir)/src/msw/region.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/os2/region.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/os2/region.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/mac/region.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8364,8 +8672,8 @@ coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8379,8 +8687,8 @@ coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp @COND_USE_GUI_1@coredll_settcmn.o: $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/os2/settings.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/os2/settings.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_settings.o: $(srcdir)/src/msw/settings.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8418,8 +8726,8 @@ coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/mac/slider.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/os2/slider.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/os2/slider.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/motif/slider.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8439,8 +8747,8 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/mac/spinbutt.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8460,8 +8768,8 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8472,8 +8780,8 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/motif/statbmp.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8493,8 +8801,8 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/mac/statbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/os2/statbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/os2/statbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/motif/statbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8529,8 +8837,8 @@ coredll_statbrma.o: $(srcdir)/src/mac/statbrma.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/generic/statline.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/os2/statline.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/os2/statline.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8547,8 +8855,8 @@ coredll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/cocoa/stattext.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/os2/stattext.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/os2/stattext.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/msw/stattext.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8577,11 +8885,14 @@ coredll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/mac/tabctrl.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8610,9 +8921,6 @@ coredll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_tbarsmpl.o: $(srcdir)/src/generic/tbarsmpl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_textcmn.o: $(srcdir)/src/common/textcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8628,8 +8936,8 @@ coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8649,12 +8957,6 @@ coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_thread.o: $(srcdir)/src/os2/thread.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_thread.o: $(srcdir)/src/mac/thread.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@coredll_timer.o: $(srcdir)/src/msw/timer.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8670,8 +8972,8 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/mac/timer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/os2/timer.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/os2/timer.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_timer.o: $(srcdir)/src/gtk/timer.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8685,8 +8987,8 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@coredll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/os2/toolbar.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/os2/toolbar.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/mac/toolbar.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8697,8 +8999,8 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/os2/tooltip.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/os2/tooltip.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/mac/tooltip.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8712,8 +9014,8 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8778,6 +9080,9 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8847,8 +9152,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_window.o: $(srcdir)/src/msw/window.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/os2/window.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/os2/window.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@coredll_window.o: $(srcdir)/src/mgl/window.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8862,17 +9167,17 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c + $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< + @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@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a: $(__corelib_PCH_DEP) $(CORELIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a: $(__corelib_PCH_DEP) $(CORELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(CORELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ -corelib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< - corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8888,6 +9193,9 @@ corelib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm corelib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8912,8 +9220,8 @@ corelib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm @COND_USE_GUI_1_WXUNIV_1@corelib_accel.o: $(srcdir)/src/generic/accel.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/os2/accel.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/os2/accel.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/motif/accel.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8936,8 +9244,8 @@ corelib_aga.o: $(srcdir)/src/mac/aga.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_app.o: $(srcdir)/src/msw/app.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/os2/app.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/os2/app.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_app.o: $(srcdir)/src/gtk/app.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8969,8 +9277,8 @@ corelib_aga.o: $(srcdir)/src/mac/aga.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9008,14 +9316,17 @@ corelib_aga.o: $(srcdir)/src/mac/aga.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/os2/brush.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1@corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/os2/brush.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_brush.o: $(srcdir)/src/gtk/brush.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9041,8 +9352,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_USE_GUI_1@corelib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/os2/button.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/os2/button.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/msw/button.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9068,8 +9379,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9086,8 +9397,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_caret.o: $(srcdir)/src/msw/caret.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9110,8 +9421,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/mac/checklst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/os2/checklst.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/os2/checklst.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@corelib_checklst.o: $(srcdir)/src/univ/checklst.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9134,8 +9445,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_USE_GUI_1@corelib_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/os2/choice.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/os2/choice.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/motif/choice.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9170,8 +9481,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_X11_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9200,8 +9511,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_X11_USE_GUI_1@corelib_colour.o: $(srcdir)/src/x11/colour.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/os2/colour.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/os2/colour.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/mac/colour.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9227,14 +9538,17 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_colschem.o: $(srcdir)/src/univ/colschem.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/os2/combobox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/os2/combobox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@corelib_combobox.o: $(srcdir)/src/univ/combobox.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9278,8 +9592,8 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/msw/control.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/os2/control.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/os2/control.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_cshelp.o: $(srcdir)/src/common/cshelp.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9302,8 +9616,8 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/msw/cursor.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/os2/cursor.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/os2/cursor.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/x11/cursor.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9320,8 +9634,8 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/motif/data.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/os2/data.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/os2/data.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@corelib_data.o: $(srcdir)/src/x11/data.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9359,8 +9673,8 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_X11_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/x11/dataobj.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9386,8 +9700,8 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/motif/dc.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/os2/dc.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/os2/dc.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9401,8 +9715,8 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/os2/dcclient.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/os2/dcclient.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9434,14 +9748,14 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/mac/dcmemory.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/mac/dcprint.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9452,8 +9766,8 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_USE_GUI_1@corelib_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9479,8 +9793,8 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/motif/dialog.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/os2/dialog.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/os2/dialog.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/mac/dialog.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9530,6 +9844,9 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9539,11 +9856,20 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dnd.o: $(srcdir)/src/os2/dnd.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dnd.o: $(srcdir)/src/os2/dnd.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_dnd.o: $(srcdir)/src/gtk/dnd.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9593,6 +9919,15 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_GTK_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9602,9 +9937,6 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9623,14 +9955,17 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/mac/filedlg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9662,8 +9997,8 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/mac/font.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/os2/font.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/os2/font.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/motif/font.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9677,8 +10012,8 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_USE_GUI_1@corelib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/mac/fontdlg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9722,14 +10057,14 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/os2/fontenum.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/os2/fontenum.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_fontmap.o: $(srcdir)/src/common/fontmap.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9761,8 +10096,8 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/mac/frame.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/os2/frame.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/os2/frame.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/gtk/frame.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9791,8 +10126,8 @@ corelib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp @COND_USE_GUI_1_WXUNIV_1@corelib_gauge.o: $(srcdir)/src/univ/gauge.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/os2/gauge.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/os2/gauge.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/mac/gauge.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9806,8 +10141,8 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@corelib_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9821,8 +10156,8 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_TOOLKIT_X11_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9842,9 +10177,6 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@corelib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c @COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< @@ -9869,8 +10201,8 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9881,8 +10213,8 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/motif/icon.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/os2/icon.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/os2/icon.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_icon.o: $(srcdir)/src/msw/icon.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9935,6 +10267,9 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9956,8 +10291,8 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_USE_GUI_1@corelib_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/os2/iniconf.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/os2/iniconf.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9974,8 +10309,11 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_USE_GUI_1@corelib_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/os2/listbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1@corelib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/os2/listbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/motif/listbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10010,17 +10348,17 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_logg.o: $(srcdir)/src/generic/logg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/os2/main.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/os2/main.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/motif/main.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10040,6 +10378,9 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_USE_GUI_1@corelib_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/mac/mdi.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10055,6 +10396,9 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10067,8 +10411,8 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/mac/menu.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/os2/menu.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/os2/menu.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/gtk/menu.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10088,8 +10432,8 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/os2/menuitem.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/os2/menuitem.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10103,20 +10447,17 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/mac/metafile.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/os2/metafile.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/os2/metafile.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/gtk/minifram.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/gtk/minifram.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/msw/minifram.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10139,8 +10480,8 @@ corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10148,6 +10489,9 @@ corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10160,8 +10504,8 @@ corelib_mslu.o: $(srcdir)/src/msw/mslu.cpp @COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10178,8 +10522,8 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/msw/notebook.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/os2/notebook.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/os2/notebook.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/generic/notebook.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10199,8 +10543,8 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_palette.o: $(srcdir)/src/mac/palette.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10211,8 +10555,8 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MGL_USE_GUI_1@corelib_palette.o: $(srcdir)/src/mgl/palette.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_palette.o: $(srcdir)/src/os2/palette.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_palette.o: $(srcdir)/src/os2/palette.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_palette.o: $(srcdir)/src/motif/palette.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10232,8 +10576,8 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_USE_GUI_1@corelib_paper.o: $(srcdir)/src/common/paper.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/os2/pen.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/os2/pen.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_pen.o: $(srcdir)/src/msw/pen.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10271,6 +10615,9 @@ corelib_pnghand.o: $(srcdir)/src/mac/pnghand.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_print.o: $(srcdir)/src/os2/print.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10298,9 +10645,15 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10316,8 +10669,8 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/os2/radiobox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/os2/radiobox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/motif/radiobox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10337,8 +10690,8 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_USE_GUI_1_WXUNIV_1@corelib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/motif/radiobut.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10373,8 +10726,8 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_region.o: $(srcdir)/src/msw/region.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/os2/region.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/os2/region.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/mac/region.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10421,8 +10774,8 @@ corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10436,8 +10789,8 @@ corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp @COND_USE_GUI_1@corelib_settcmn.o: $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/os2/settings.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/os2/settings.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_settings.o: $(srcdir)/src/msw/settings.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10475,8 +10828,8 @@ corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/mac/slider.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/os2/slider.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/os2/slider.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/motif/slider.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10496,8 +10849,8 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/mac/spinbutt.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10517,8 +10870,8 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10529,8 +10882,8 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/motif/statbmp.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10550,8 +10903,8 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/mac/statbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/os2/statbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/os2/statbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/motif/statbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10586,8 +10939,8 @@ corelib_statbrma.o: $(srcdir)/src/mac/statbrma.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/generic/statline.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/os2/statline.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/os2/statline.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10604,8 +10957,8 @@ corelib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/cocoa/stattext.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/os2/stattext.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/os2/stattext.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/msw/stattext.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10634,11 +10987,14 @@ corelib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/mac/tabctrl.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10667,9 +11023,6 @@ corelib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_tbarsmpl.o: $(srcdir)/src/generic/tbarsmpl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_textcmn.o: $(srcdir)/src/common/textcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10685,8 +11038,8 @@ corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10706,12 +11059,6 @@ corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_thread.o: $(srcdir)/src/os2/thread.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_thread.o: $(srcdir)/src/mac/thread.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@corelib_timer.o: $(srcdir)/src/msw/timer.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10727,8 +11074,8 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/mac/timer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/os2/timer.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/os2/timer.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_timer.o: $(srcdir)/src/gtk/timer.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10742,8 +11089,8 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@corelib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/os2/toolbar.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/os2/toolbar.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/mac/toolbar.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10754,8 +11101,8 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/os2/tooltip.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/os2/tooltip.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/mac/tooltip.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10769,8 +11116,8 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10835,6 +11182,9 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10904,8 +11254,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_window.o: $(srcdir)/src/msw/window.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/os2/window.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/os2/window.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@corelib_window.o: $(srcdir)/src/mgl/window.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10919,17 +11269,21 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c + $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< + @COND_USE_GUI_1@corelib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__dbgriddll_PCH_DEP) $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__dbgriddll___so_symlinks_cmd) dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a: $(__dbgridlib_PCH_DEP) $(DBGRIDLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a: $(__dbgridlib_PCH_DEP) $(DBGRIDLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(AR) rcu $@ $(DBGRIDLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ @@ -10940,18 +11294,22 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__gldll_PCH_DEP) $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(EXTRALIBS_OPENGL) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__gldll_PCH_DEP) $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) $(__coredll___depname) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd) +@COND_TOOLKIT_MOTIF@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< + @COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/mac/glcanvas.cpp @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF@gldll_glcanvas.o: $(srcdir)/src/motif/glcanvas.cpp -@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM@gldll_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp +@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK@gldll_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp @COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< @@ -10959,19 +11317,22 @@ distclean: clean @COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< -@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(__gllib_PCH_DEP) $(GLLIB_OBJECTS) +@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(__gllib_PCH_DEP) $(GLLIB_OBJECTS) @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $@ @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(AR) rcu $@ $(GLLIB_OBJECTS) @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(RANLIB) $@ +@COND_TOOLKIT_MOTIF@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC@gllib_glcanvas.o: $(srcdir)/src/mac/glcanvas.cpp @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF@gllib_glcanvas.o: $(srcdir)/src/motif/glcanvas.cpp -@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM@gllib_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp +@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK@gllib_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp @COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $< @@ -10980,9 +11341,16 @@ distclean: clean @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $< @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__htmldll_PCH_DEP) $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_HTML) +@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(__htmldll___so_symlinks_cmd) +@COND_PLATFORM_UNIX_1@htmldll_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1@htmldll_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< + htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< @@ -11049,11 +11417,17 @@ htmldll_m_tables.o: $(srcdir)/src/html/m_tables.cpp htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a: $(__htmllib_PCH_DEP) $(HTMLLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a: $(__htmllib_PCH_DEP) $(HTMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(AR) rcu $@ $(HTMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(RANLIB) $@ +@COND_PLATFORM_UNIX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< + htmllib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< @@ -11121,18 +11495,20 @@ htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname) - $(INSTALL_DIR) $(datadir)/aclocal - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(datadir)/aclocal) - $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx - (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx) - $(INSTALL_DIR) $(includedir) + $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal + (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx + (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx) + $(INSTALL_DIR) $(DESTDIR)$(includedir) for f in $(ALL_HEADERS); do \ - if test ! -d $(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/include//$$f $(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/$$f; \ done @echo " " + @echo " ------------------------------------------------------" + @echo " " @echo " The installation of wxWindows is finished. On certain" @echo " platforms (e.g. Linux) you'll now have to run ldconfig" @echo " if you installed a shared library and also modify the" @@ -11143,180 +11519,183 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in @echo " " @echo " Read the wxWindows Licence on licencing conditions." @echo " " + @echo " ------------------------------------------------------" + @echo " " @COND_USE_GUI_1@install-afm: -@COND_USE_GUI_1@ $(INSTALL_DIR) $(datadir)/wx/2.5/afm -@COND_USE_GUI_1@ (cd $(srcdir) ; $(INSTALL_DATA) misc/afm/*.afm $(datadir)/wx/2.5/afm) +@COND_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/2.5/afm +@COND_USE_GUI_1@ (cd $(srcdir) ; $(INSTALL_DATA) misc/afm/*.afm $(DESTDIR)$(datadir)/wx/2.5/afm) @COND_USE_GUI_1@install-gsafm: -@COND_USE_GUI_1@ $(INSTALL_DIR) $(datadir)/wx/2.5/gs_afm -@COND_USE_GUI_1@ (cd $(srcdir) ; $(INSTALL_DATA) misc/gs_afm/*.afm $(datadir)/wx/2.5/gs_afm) +@COND_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/2.5/gs_afm +@COND_USE_GUI_1@ (cd $(srcdir) ; $(INSTALL_DATA) misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/2.5/gs_afm) install-strip: install - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) install-wxconfig: - $(INSTALL_DIR) $(bindir) - $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(bindir) - (cd $(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config) + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir) + (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(libdir) ; $(__advdll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1@install_basedll: -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ (cd $(libdir) ; $(__basedll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_0_SHARED_0@install_baselib: -@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(libdir) ; $(__coredll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_corelib: -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_dbgriddll: -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_dbgridlib: -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(libdir) ; $(__gldll___so_symlinks_inst_cmd)) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd)) @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@install_gllib: -@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@install_htmldll: -@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ (cd $(libdir) ; $(__htmldll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@install_htmllib: -@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_MONOLITHIC_1_SHARED_1@install_monodll: -@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_1_SHARED_1@ (cd $(libdir) ; $(__monodll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_1_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_1_SHARED_0@install_monolib: -@COND_MONOLITHIC_1_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_1_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_1_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_1_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1@install_netdll: -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ (cd $(libdir) ; $(__netdll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_0_SHARED_0@install_netlib: -@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_odbcdll: -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(libdir) ; $(__odbcdll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@install_odbcdll: +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd)) -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_odbclib: -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@install_odbclib: +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@install_wxexpat: -@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: -@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_0_WXUSE_ODBC_BUILTIN@install_wxodbc: -@COND_SHARED_0_WXUSE_ODBC_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0_WXUSE_ODBC_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_WXUSE_ODBC_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0_WXUSE_ODBC_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@install_wxpng: -@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_0_WXUSE_REGEX_BUILTIN@install_wxregex: -@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0_WXUSE_REGEX_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@install_wxtiff: -@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_0_WXUSE_ZLIB_BUILTIN@install_wxzlib: -@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1@install_xmldll: -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) -@COND_MONOLITHIC_0_SHARED_1@ (cd $(libdir) ; $(__xmldll___so_symlinks_inst_cmd)) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_0_SHARED_0@install_xmllib: -@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) locale_install: - $(INSTALL_DIR) $(datadir)/locale + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale for l in $(LOCALE_LINGUAS) ; do \ - $(INSTALL_DIR) $(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(datadir)/locale/$$l/LC_MESSAGES ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ if test -f $(srcdir)/locale/$$l.mo ; then \ - $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ + $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ fi ; \ done -@COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).0.r: -@COND_TOOLKIT_MAC@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -@COND_TOOLKIT_MAC@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).1.r: +@COND_TOOLKIT_MAC@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc +@COND_TOOLKIT_MAC@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r @COND_TOOLKIT_MAC@macos-res-install: $(__macos_res___depname) -@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir) -@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir) +@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir) +@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir) @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__monodll_PCH_DEP) $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) -@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_ODBC) +@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) +@COND_MONOLITHIC_1_SHARED_1@ @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd) monodll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c @@ -11337,6 +11716,9 @@ monodll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm monodll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11361,8 +11743,8 @@ monodll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm @COND_USE_GUI_1_WXUNIV_1@monodll_accel.o: $(srcdir)/src/generic/accel.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/os2/accel.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/os2/accel.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/motif/accel.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11385,8 +11767,8 @@ monodll_aga.o: $(srcdir)/src/mac/aga.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_app.o: $(srcdir)/src/msw/app.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/os2/app.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/os2/app.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_app.o: $(srcdir)/src/gtk/app.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11436,8 +11818,8 @@ monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11475,14 +11857,17 @@ monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/os2/brush.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/os2/brush.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_brush.o: $(srcdir)/src/gtk/brush.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11508,8 +11893,8 @@ monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_USE_GUI_1@monodll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/os2/button.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/os2/button.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/msw/button.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11538,8 +11923,8 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11556,8 +11941,8 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_caret.o: $(srcdir)/src/msw/caret.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11580,8 +11965,8 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/mac/checklst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/os2/checklst.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/os2/checklst.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@monodll_checklst.o: $(srcdir)/src/univ/checklst.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11598,14 +11983,20 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/cocoa/checklst.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/os2/choice.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/os2/choice.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/motif/choice.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11640,8 +12031,8 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_X11_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11676,8 +12067,8 @@ monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp @COND_TOOLKIT_X11_USE_GUI_1@monodll_colour.o: $(srcdir)/src/x11/colour.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/os2/colour.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/os2/colour.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/mac/colour.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11703,14 +12094,17 @@ monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_colschem.o: $(srcdir)/src/univ/colschem.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/os2/combobox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/os2/combobox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@monodll_combobox.o: $(srcdir)/src/univ/combobox.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11757,8 +12151,8 @@ monodll_config.o: $(srcdir)/src/common/config.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/msw/control.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/os2/control.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/os2/control.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11784,8 +12178,8 @@ monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/msw/cursor.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/os2/cursor.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/os2/cursor.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/x11/cursor.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11802,8 +12196,8 @@ monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/motif/data.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/os2/data.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/os2/data.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_data.o: $(srcdir)/src/x11/data.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11841,8 +12235,8 @@ monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_X11_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/x11/dataobj.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11883,8 +12277,8 @@ monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/motif/dc.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/os2/dc.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/os2/dc.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11901,8 +12295,8 @@ monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/os2/dcclient.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/os2/dcclient.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11934,14 +12328,14 @@ monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/mac/dcmemory.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/mac/dcprint.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11952,8 +12346,8 @@ monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp @COND_USE_GUI_1@monodll_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11982,8 +12376,8 @@ monodll_dde.o: $(srcdir)/src/msw/dde.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/motif/dialog.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/os2/dialog.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/os2/dialog.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/mac/dialog.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12024,6 +12418,9 @@ monodll_dde.o: $(srcdir)/src/msw/dde.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_dir.o: $(srcdir)/src/unix/dir.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_dir.o: $(srcdir)/src/os2/dir.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@monodll_dir.o: $(srcdir)/src/msw/dir.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12048,6 +12445,9 @@ monodll_dircmn.o: $(srcdir)/src/common/dircmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12060,11 +12460,20 @@ monodll_dirmac.o: $(srcdir)/src/mac/dirmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dnd.o: $(srcdir)/src/os2/dnd.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dnd.o: $(srcdir)/src/os2/dnd.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_dnd.o: $(srcdir)/src/gtk/dnd.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12126,6 +12535,15 @@ monodll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12135,9 +12553,6 @@ monodll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - monodll_extended.o: $(srcdir)/src/common/extended.c $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -12159,6 +12574,9 @@ monodll_extended.o: $(srcdir)/src/common/extended.c @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12174,8 +12592,8 @@ monodll_fileconf.o: $(srcdir)/src/common/fileconf.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/mac/filedlg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12219,8 +12637,8 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/mac/font.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/os2/font.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/os2/font.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/motif/font.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12234,8 +12652,8 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp @COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/mac/fontdlg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12279,14 +12697,14 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/os2/fontenum.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/os2/fontenum.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_fontmap.o: $(srcdir)/src/common/fontmap.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12318,8 +12736,8 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/mac/frame.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/os2/frame.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/os2/frame.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/gtk/frame.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12357,8 +12775,8 @@ monodll_ftp.o: $(srcdir)/src/common/ftp.cpp @COND_USE_GUI_1_WXUNIV_1@monodll_gauge.o: $(srcdir)/src/univ/gauge.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/os2/gauge.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/os2/gauge.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/mac/gauge.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12372,8 +12790,8 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@monodll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12387,8 +12805,8 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_TOOLKIT_X11_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12429,8 +12847,8 @@ monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -12453,6 +12871,9 @@ monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c monodll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_gzstream.o: $(srcdir)/src/common/gzstream.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_hash.o: $(srcdir)/src/common/hash.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12480,8 +12901,8 @@ monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12516,8 +12937,8 @@ monodll_http.o: $(srcdir)/src/common/http.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/motif/icon.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/os2/icon.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/os2/icon.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_icon.o: $(srcdir)/src/msw/icon.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12570,6 +12991,9 @@ monodll_http.o: $(srcdir)/src/common/http.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12591,8 +13015,8 @@ monodll_http.o: $(srcdir)/src/common/http.cpp @COND_USE_GUI_1@monodll_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/os2/iniconf.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/os2/iniconf.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12627,8 +13051,8 @@ monodll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp @COND_TOOLKIT_X11_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp -@COND_TOOLKIT_OS2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp +@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12642,8 +13066,11 @@ monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp monodll_list.o: $(srcdir)/src/common/list.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/os2/listbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1@monodll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/os2/listbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/motif/listbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12678,6 +13105,9 @@ monodll_list.o: $(srcdir)/src/common/list.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12723,8 +13153,8 @@ monodll_m_tables.o: $(srcdir)/src/html/m_tables.cpp monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/os2/main.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/os2/main.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/motif/main.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12744,6 +13174,9 @@ monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_USE_GUI_1@monodll_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/mac/mdi.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12759,6 +13192,9 @@ monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12774,8 +13210,8 @@ monodll_memory.o: $(srcdir)/src/common/memory.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/mac/menu.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/os2/menu.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/os2/menu.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/gtk/menu.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12795,8 +13231,8 @@ monodll_memory.o: $(srcdir)/src/common/memory.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/os2/menuitem.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/os2/menuitem.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12810,8 +13246,8 @@ monodll_memory.o: $(srcdir)/src/common/memory.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/mac/metafile.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/os2/metafile.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/os2/metafile.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12834,14 +13270,14 @@ monodll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/motif/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/gtk/minifram.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/gtk/minifram.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/msw/minifram.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12867,8 +13303,8 @@ monodll_module.o: $(srcdir)/src/common/module.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12876,6 +13312,9 @@ monodll_module.o: $(srcdir)/src/common/module.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12891,8 +13330,8 @@ monodll_mstream.o: $(srcdir)/src/common/mstream.cpp @COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12909,8 +13348,8 @@ monodll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/msw/notebook.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/os2/notebook.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/os2/notebook.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/generic/notebook.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12933,8 +13372,8 @@ monodll_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_palette.o: $(srcdir)/src/mac/palette.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12945,8 +13384,8 @@ monodll_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_MGL_USE_GUI_1@monodll_palette.o: $(srcdir)/src/mgl/palette.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_palette.o: $(srcdir)/src/os2/palette.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_palette.o: $(srcdir)/src/os2/palette.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_palette.o: $(srcdir)/src/motif/palette.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12966,8 +13405,8 @@ monodll_object.o: $(srcdir)/src/common/object.cpp @COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/os2/pen.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/os2/pen.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_pen.o: $(srcdir)/src/msw/pen.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13005,6 +13444,9 @@ monodll_pnghand.o: $(srcdir)/src/mac/pnghand.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_print.o: $(srcdir)/src/os2/print.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13032,9 +13474,15 @@ monodll_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13056,8 +13504,8 @@ monodll_protocol.o: $(srcdir)/src/common/protocol.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/os2/radiobox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/os2/radiobox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/motif/radiobox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13077,8 +13525,8 @@ monodll_protocol.o: $(srcdir)/src/common/protocol.cpp @COND_USE_GUI_1_WXUNIV_1@monodll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/motif/radiobut.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13119,8 +13567,8 @@ monodll_regex.o: $(srcdir)/src/common/regex.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_region.o: $(srcdir)/src/msw/region.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/os2/region.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/os2/region.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/mac/region.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13185,8 +13633,8 @@ monodll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13200,8 +13648,8 @@ monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp @COND_USE_GUI_1@monodll_settcmn.o: $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/os2/settings.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/os2/settings.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_settings.o: $(srcdir)/src/msw/settings.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13239,8 +13687,8 @@ monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/mac/slider.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/os2/slider.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/os2/slider.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/motif/slider.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13275,8 +13723,8 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/mac/spinbutt.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13296,8 +13744,8 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13311,8 +13759,8 @@ monodll_splash.o: $(srcdir)/src/generic/splash.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/motif/statbmp.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13332,8 +13780,8 @@ monodll_splash.o: $(srcdir)/src/generic/splash.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/mac/statbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/os2/statbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/os2/statbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/motif/statbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13368,8 +13816,8 @@ monodll_statbrma.o: $(srcdir)/src/mac/statbrma.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/generic/statline.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/os2/statline.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/os2/statline.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13386,8 +13834,8 @@ monodll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/cocoa/stattext.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/os2/stattext.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/os2/stattext.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/msw/stattext.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13416,6 +13864,9 @@ monodll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13434,8 +13885,8 @@ monodll_sysopt.o: $(srcdir)/src/common/sysopt.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/mac/tabctrl.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13488,9 +13939,6 @@ monodll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp monodll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_tbarsmpl.o: $(srcdir)/src/generic/tbarsmpl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - monodll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13509,8 +13957,8 @@ monodll_textbuf.o: $(srcdir)/src/common/textbuf.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13536,11 +13984,11 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_PLATFORM_WIN32_1@monodll_thread.o: $(srcdir)/src/msw/thread.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_thread.o: $(srcdir)/src/os2/thread.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_thread.o: $(srcdir)/src/os2/thread.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_thread.o: $(srcdir)/src/mac/thread.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_thread.o: $(srcdir)/src/mac/thread.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13566,8 +14014,8 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/mac/timer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/os2/timer.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/os2/timer.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_timer.o: $(srcdir)/src/gtk/timer.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13587,8 +14035,8 @@ monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/os2/toolbar.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/os2/toolbar.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/mac/toolbar.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13599,8 +14047,8 @@ monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/os2/tooltip.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/os2/tooltip.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/mac/tooltip.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13614,8 +14062,8 @@ monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13668,6 +14116,9 @@ monodll_url.o: $(srcdir)/src/common/url.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/motif/utils.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_utils.o: $(srcdir)/src/os2/utils.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13689,6 +14140,9 @@ monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13698,6 +14152,9 @@ monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13749,8 +14206,8 @@ monodll_volume.o: $(srcdir)/src/msw/volume.cpp @COND_USE_GUI_1@monodll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1@monodll_wave.o: $(srcdir)/src/os2/wave.cpp -@COND_TOOLKIT_OS2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1@monodll_wave.o: $(srcdir)/src/os2/wave.cpp +@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_wave.o: $(srcdir)/src/msw/wave.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13791,8 +14248,8 @@ monodll_win32.o: $(srcdir)/src/univ/themes/win32.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_window.o: $(srcdir)/src/msw/window.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/os2/window.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/os2/window.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monodll_window.o: $(srcdir)/src/mgl/window.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13815,19 +14272,31 @@ monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c + $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< + monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_xti.o: $(srcdir)/src/common/xti.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +monodll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(__monolib_PCH_DEP) $(MONOLIB_OBJECTS) +@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(__monolib_PCH_DEP) $(MONOLIB_OBJECTS) @COND_MONOLITHIC_1_SHARED_0@ rm -f $@ @COND_MONOLITHIC_1_SHARED_0@ $(AR) rcu $@ $(MONOLIB_OBJECTS) @COND_MONOLITHIC_1_SHARED_0@ $(RANLIB) $@ @@ -13850,6 +14319,9 @@ monolib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm monolib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -13874,8 +14346,8 @@ monolib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm @COND_USE_GUI_1_WXUNIV_1@monolib_accel.o: $(srcdir)/src/generic/accel.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/os2/accel.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/os2/accel.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/motif/accel.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -13898,8 +14370,8 @@ monolib_aga.o: $(srcdir)/src/mac/aga.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_app.o: $(srcdir)/src/msw/app.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/os2/app.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/os2/app.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_app.o: $(srcdir)/src/gtk/app.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -13949,8 +14421,8 @@ monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -13988,14 +14460,17 @@ monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/os2/brush.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/os2/brush.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_brush.o: $(srcdir)/src/gtk/brush.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14021,8 +14496,8 @@ monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_USE_GUI_1@monolib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/os2/button.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/os2/button.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/msw/button.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14051,8 +14526,8 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14069,8 +14544,8 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_caret.o: $(srcdir)/src/msw/caret.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14093,8 +14568,8 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/mac/checklst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/os2/checklst.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/os2/checklst.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@monolib_checklst.o: $(srcdir)/src/univ/checklst.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14111,14 +14586,20 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/cocoa/checklst.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/os2/choice.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/os2/choice.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/motif/choice.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14153,8 +14634,8 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_X11_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14189,8 +14670,8 @@ monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp @COND_TOOLKIT_X11_USE_GUI_1@monolib_colour.o: $(srcdir)/src/x11/colour.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/os2/colour.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/os2/colour.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/mac/colour.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14216,14 +14697,17 @@ monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_colschem.o: $(srcdir)/src/univ/colschem.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/os2/combobox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/os2/combobox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@monolib_combobox.o: $(srcdir)/src/univ/combobox.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14270,8 +14754,8 @@ monolib_config.o: $(srcdir)/src/common/config.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/msw/control.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/os2/control.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/os2/control.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14297,8 +14781,8 @@ monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/msw/cursor.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/os2/cursor.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/os2/cursor.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/x11/cursor.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14315,8 +14799,8 @@ monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/motif/data.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/os2/data.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/os2/data.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_data.o: $(srcdir)/src/x11/data.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14354,8 +14838,8 @@ monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_X11_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/x11/dataobj.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14396,8 +14880,8 @@ monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/motif/dc.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/os2/dc.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/os2/dc.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14414,8 +14898,8 @@ monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/os2/dcclient.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/os2/dcclient.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14447,14 +14931,14 @@ monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/mac/dcmemory.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/mac/dcprint.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14465,8 +14949,8 @@ monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp @COND_USE_GUI_1@monolib_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14495,8 +14979,8 @@ monolib_dde.o: $(srcdir)/src/msw/dde.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/motif/dialog.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/os2/dialog.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/os2/dialog.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/mac/dialog.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14537,6 +15021,9 @@ monolib_dde.o: $(srcdir)/src/msw/dde.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_dir.o: $(srcdir)/src/unix/dir.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_dir.o: $(srcdir)/src/os2/dir.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@monolib_dir.o: $(srcdir)/src/msw/dir.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14561,6 +15048,9 @@ monolib_dircmn.o: $(srcdir)/src/common/dircmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14573,11 +15063,20 @@ monolib_dirmac.o: $(srcdir)/src/mac/dirmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dnd.o: $(srcdir)/src/os2/dnd.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dnd.o: $(srcdir)/src/os2/dnd.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_dnd.o: $(srcdir)/src/gtk/dnd.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14639,6 +15138,15 @@ monolib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14648,9 +15156,6 @@ monolib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - monolib_extended.o: $(srcdir)/src/common/extended.c $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -14672,6 +15177,9 @@ monolib_extended.o: $(srcdir)/src/common/extended.c @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14687,8 +15195,8 @@ monolib_fileconf.o: $(srcdir)/src/common/fileconf.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/mac/filedlg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14732,8 +15240,8 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/mac/font.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/os2/font.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/os2/font.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/motif/font.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14747,8 +15255,8 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp @COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/mac/fontdlg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14792,14 +15300,14 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/os2/fontenum.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/os2/fontenum.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_fontmap.o: $(srcdir)/src/common/fontmap.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14831,8 +15339,8 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/mac/frame.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/os2/frame.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/os2/frame.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/gtk/frame.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14870,8 +15378,8 @@ monolib_ftp.o: $(srcdir)/src/common/ftp.cpp @COND_USE_GUI_1_WXUNIV_1@monolib_gauge.o: $(srcdir)/src/univ/gauge.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/os2/gauge.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/os2/gauge.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/mac/gauge.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14885,8 +15393,8 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@monolib_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14900,8 +15408,8 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_TOOLKIT_X11_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14942,8 +15450,8 @@ monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -14966,6 +15474,9 @@ monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c monolib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_gzstream.o: $(srcdir)/src/common/gzstream.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_hash.o: $(srcdir)/src/common/hash.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14993,8 +15504,8 @@ monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp monolib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15029,8 +15540,8 @@ monolib_http.o: $(srcdir)/src/common/http.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/motif/icon.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/os2/icon.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/os2/icon.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_icon.o: $(srcdir)/src/msw/icon.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15083,6 +15594,9 @@ monolib_http.o: $(srcdir)/src/common/http.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15104,8 +15618,8 @@ monolib_http.o: $(srcdir)/src/common/http.cpp @COND_USE_GUI_1@monolib_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/os2/iniconf.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/os2/iniconf.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15140,8 +15654,8 @@ monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp @COND_TOOLKIT_X11_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp -@COND_TOOLKIT_OS2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp +@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15155,8 +15669,11 @@ monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp monolib_list.o: $(srcdir)/src/common/list.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/os2/listbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1@monolib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/os2/listbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/motif/listbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15191,6 +15708,9 @@ monolib_list.o: $(srcdir)/src/common/list.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15236,8 +15756,8 @@ monolib_m_tables.o: $(srcdir)/src/html/m_tables.cpp monolib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/os2/main.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/os2/main.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/motif/main.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15257,6 +15777,9 @@ monolib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_USE_GUI_1@monolib_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/mac/mdi.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15272,6 +15795,9 @@ monolib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15287,8 +15813,8 @@ monolib_memory.o: $(srcdir)/src/common/memory.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/mac/menu.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/os2/menu.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/os2/menu.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/gtk/menu.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15308,8 +15834,8 @@ monolib_memory.o: $(srcdir)/src/common/memory.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/os2/menuitem.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/os2/menuitem.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15323,8 +15849,8 @@ monolib_memory.o: $(srcdir)/src/common/memory.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/mac/metafile.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/os2/metafile.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/os2/metafile.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15347,14 +15873,14 @@ monolib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/motif/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/gtk/minifram.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/gtk/minifram.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/msw/minifram.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15380,8 +15906,8 @@ monolib_module.o: $(srcdir)/src/common/module.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15389,6 +15915,9 @@ monolib_module.o: $(srcdir)/src/common/module.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15404,8 +15933,8 @@ monolib_mstream.o: $(srcdir)/src/common/mstream.cpp @COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15422,8 +15951,8 @@ monolib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/msw/notebook.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/os2/notebook.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/os2/notebook.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/generic/notebook.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15446,8 +15975,8 @@ monolib_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_palette.o: $(srcdir)/src/mac/palette.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15458,8 +15987,8 @@ monolib_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_MGL_USE_GUI_1@monolib_palette.o: $(srcdir)/src/mgl/palette.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_palette.o: $(srcdir)/src/os2/palette.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_palette.o: $(srcdir)/src/os2/palette.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_palette.o: $(srcdir)/src/motif/palette.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15479,8 +16008,8 @@ monolib_object.o: $(srcdir)/src/common/object.cpp @COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/os2/pen.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/os2/pen.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_pen.o: $(srcdir)/src/msw/pen.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15518,6 +16047,9 @@ monolib_pnghand.o: $(srcdir)/src/mac/pnghand.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_print.o: $(srcdir)/src/os2/print.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15545,9 +16077,15 @@ monolib_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15569,8 +16107,8 @@ monolib_protocol.o: $(srcdir)/src/common/protocol.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/os2/radiobox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/os2/radiobox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/motif/radiobox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15590,8 +16128,8 @@ monolib_protocol.o: $(srcdir)/src/common/protocol.cpp @COND_USE_GUI_1_WXUNIV_1@monolib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/motif/radiobut.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15632,8 +16170,8 @@ monolib_regex.o: $(srcdir)/src/common/regex.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_region.o: $(srcdir)/src/msw/region.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/os2/region.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/os2/region.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/mac/region.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15698,8 +16236,8 @@ monolib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15713,8 +16251,8 @@ monolib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp @COND_USE_GUI_1@monolib_settcmn.o: $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/os2/settings.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/os2/settings.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_settings.o: $(srcdir)/src/msw/settings.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15752,8 +16290,8 @@ monolib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/mac/slider.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/os2/slider.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/os2/slider.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/motif/slider.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15788,8 +16326,8 @@ monolib_socket.o: $(srcdir)/src/common/socket.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/mac/spinbutt.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15809,8 +16347,8 @@ monolib_socket.o: $(srcdir)/src/common/socket.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15824,8 +16362,8 @@ monolib_splash.o: $(srcdir)/src/generic/splash.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/motif/statbmp.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15845,8 +16383,8 @@ monolib_splash.o: $(srcdir)/src/generic/splash.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/mac/statbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/os2/statbox.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/os2/statbox.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/motif/statbox.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15881,8 +16419,8 @@ monolib_statbrma.o: $(srcdir)/src/mac/statbrma.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/generic/statline.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/os2/statline.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/os2/statline.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15899,8 +16437,8 @@ monolib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/cocoa/stattext.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/os2/stattext.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/os2/stattext.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/msw/stattext.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15929,6 +16467,9 @@ monolib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15947,8 +16488,8 @@ monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/mac/tabctrl.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16001,9 +16542,6 @@ monolib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp monolib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_tbarsmpl.o: $(srcdir)/src/generic/tbarsmpl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16022,8 +16560,8 @@ monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16049,11 +16587,11 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_PLATFORM_WIN32_1@monolib_thread.o: $(srcdir)/src/msw/thread.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_thread.o: $(srcdir)/src/os2/thread.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_thread.o: $(srcdir)/src/os2/thread.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_thread.o: $(srcdir)/src/mac/thread.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_thread.o: $(srcdir)/src/mac/thread.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16079,8 +16617,8 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/mac/timer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/os2/timer.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/os2/timer.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_timer.o: $(srcdir)/src/gtk/timer.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16100,8 +16638,8 @@ monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/os2/toolbar.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/os2/toolbar.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/mac/toolbar.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16112,8 +16650,8 @@ monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/os2/tooltip.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/os2/tooltip.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/mac/tooltip.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16127,8 +16665,8 @@ monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16181,6 +16719,9 @@ monolib_url.o: $(srcdir)/src/common/url.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/motif/utils.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_utils.o: $(srcdir)/src/os2/utils.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16202,6 +16743,9 @@ monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16211,6 +16755,9 @@ monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16262,8 +16809,8 @@ monolib_volume.o: $(srcdir)/src/msw/volume.cpp @COND_USE_GUI_1@monolib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1@monolib_wave.o: $(srcdir)/src/os2/wave.cpp -@COND_TOOLKIT_OS2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1@monolib_wave.o: $(srcdir)/src/os2/wave.cpp +@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_wave.o: $(srcdir)/src/msw/wave.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16304,8 +16851,8 @@ monolib_win32.o: $(srcdir)/src/univ/themes/win32.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_window.o: $(srcdir)/src/msw/window.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/os2/window.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/os2/window.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monolib_window.o: $(srcdir)/src/mgl/window.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16328,12 +16875,24 @@ monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c + $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< + monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_xti.o: $(srcdir)/src/common/xti.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +monolib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +monolib_xtixml.o: $(srcdir)/src/common/xtixml.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16341,7 +16900,8 @@ monolib_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__netdll_PCH_DEP) $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1@ @COND_MONOLITHIC_0_SHARED_1@ $(__netdll___so_symlinks_cmd) netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp @@ -16362,6 +16922,9 @@ netdll_ftp.o: $(srcdir)/src/common/ftp.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< +@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/os2/gsocket.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< + @COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< @@ -16389,7 +16952,7 @@ netdll_socket.o: $(srcdir)/src/common/socket.cpp netdll_url.o: $(srcdir)/src/common/url.cpp $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(__netlib_PCH_DEP) $(NETLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(__netlib_PCH_DEP) $(NETLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(NETLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -16412,6 +16975,9 @@ netlib_ftp.o: $(srcdir)/src/common/ftp.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< +@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/os2/gsocket.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< + @COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< @@ -16439,9 +17005,10 @@ netlib_socket.o: $(srcdir)/src/common/socket.cpp netlib_url.o: $(srcdir)/src/common/url.cpp $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__odbcdll_PCH_DEP) $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_ODBC) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__odbcdll___so_symlinks_cmd) +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__odbcdll_PCH_DEP) $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_ODBC) +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ +@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(__odbcdll___so_symlinks_cmd) odbcdll_db.o: $(srcdir)/src/common/db.cpp $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< @@ -16449,10 +17016,10 @@ odbcdll_db.o: $(srcdir)/src/common/db.cpp odbcdll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(__odbclib_PCH_DEP) $(ODBCLIB_OBJECTS) -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ rm -f $@ -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(AR) rcu $@ $(ODBCLIB_OBJECTS) -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(__odbclib_PCH_DEP) $(ODBCLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@ rm -f $@ +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@ $(AR) rcu $@ $(ODBCLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@ $(RANLIB) $@ odbclib_db.o: $(srcdir)/src/common/db.cpp $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $< @@ -16465,7 +17032,7 @@ samples: uninstall: -@COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXEXPAT_OBJECTS) +@COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXEXPAT_OBJECTS) @COND_WXUSE_EXPAT_BUILTIN@ rm -f $@ @COND_WXUSE_EXPAT_BUILTIN@ $(AR) rcu $@ $(WXEXPAT_OBJECTS) @COND_WXUSE_EXPAT_BUILTIN@ $(RANLIB) $@ @@ -16479,7 +17046,7 @@ wxexpat_xmlrole.o: $(srcdir)/src/expat/lib/xmlrole.c wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $< -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@$(LIBDIRNAME)/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXJPEG_OBJECTS) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXJPEG_OBJECTS) @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ rm -f $@ @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(AR) rcu $@ $(WXJPEG_OBJECTS) @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(RANLIB) $@ @@ -16622,7 +17189,7 @@ wxjpeg_jquant2.o: $(srcdir)/src/jpeg/jquant2.c wxjpeg_jutils.o: $(srcdir)/src/jpeg/jutils.c $(CCC) -c -o $@ $(WXJPEG_CFLAGS) $< -@COND_WXUSE_ODBC_BUILTIN@$(LIBDIRNAME)/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXODBC_OBJECTS) +@COND_WXUSE_ODBC_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXODBC_OBJECTS) @COND_WXUSE_ODBC_BUILTIN@ rm -f $@ @COND_WXUSE_ODBC_BUILTIN@ $(AR) rcu $@ $(WXODBC_OBJECTS) @COND_WXUSE_ODBC_BUILTIN@ $(RANLIB) $@ @@ -16672,7 +17239,7 @@ wxodbc_prepare.o: $(srcdir)/src/iodbc/prepare.c wxodbc_result.o: $(srcdir)/src/iodbc/result.c $(CCC) -c -o $@ $(WXODBC_CFLAGS) $< -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@$(LIBDIRNAME)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXPNG_OBJECTS) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXPNG_OBJECTS) @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ rm -f $@ @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(AR) rcu $@ $(WXPNG_OBJECTS) @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(RANLIB) $@ @@ -16728,7 +17295,7 @@ wxpng_pngwtran.o: $(srcdir)/src/png/pngwtran.c wxpng_pngwutil.o: $(srcdir)/src/png/pngwutil.c $(CCC) -c -o $@ $(WXPNG_CFLAGS) $< -@COND_WXUSE_REGEX_BUILTIN@$(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXREGEX_OBJECTS) +@COND_WXUSE_REGEX_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXREGEX_OBJECTS) @COND_WXUSE_REGEX_BUILTIN@ rm -f $@ @COND_WXUSE_REGEX_BUILTIN@ $(AR) rcu $@ $(WXREGEX_OBJECTS) @COND_WXUSE_REGEX_BUILTIN@ $(RANLIB) $@ @@ -16745,7 +17312,7 @@ wxregex_regexec.o: $(srcdir)/src/regex/regexec.c wxregex_regfree.o: $(srcdir)/src/regex/regfree.c $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $< -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@$(LIBDIRNAME)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXTIFF_OBJECTS) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXTIFF_OBJECTS) @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ rm -f $@ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(AR) rcu $@ $(WXTIFF_OBJECTS) @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(RANLIB) $@ @@ -16840,6 +17407,9 @@ wxtiff_tif_tile.o: $(srcdir)/src/tiff/tif_tile.c @COND_PLATFORM_MACOSX_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/tif_unix.c @COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $< +@COND_PLATFORM_OS2_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/tif_unix.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $< + wxtiff_tif_version.o: $(srcdir)/src/tiff/tif_version.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $< @@ -16855,7 +17425,7 @@ wxtiff_tif_write.o: $(srcdir)/src/tiff/tif_write.c wxtiff_tif_zip.o: $(srcdir)/src/tiff/tif_zip.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $< -@COND_WXUSE_ZLIB_BUILTIN@$(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXZLIB_OBJECTS) +@COND_WXUSE_ZLIB_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXZLIB_OBJECTS) @COND_WXUSE_ZLIB_BUILTIN@ rm -f $@ @COND_WXUSE_ZLIB_BUILTIN@ $(AR) rcu $@ $(WXZLIB_OBJECTS) @COND_WXUSE_ZLIB_BUILTIN@ $(RANLIB) $@ @@ -16903,13 +17473,17 @@ wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $< @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__xmldll_PCH_DEP) $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_XML) +@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_XML) +@COND_MONOLITHIC_0_SHARED_1@ @COND_MONOLITHIC_0_SHARED_1@ $(__xmldll___so_symlinks_cmd) xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(__xmllib_PCH_DEP) $(XMLLIB_OBJECTS) +xmldll_xtixml.o: $(srcdir)/src/common/xtixml.cpp + $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $< + +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(__xmllib_PCH_DEP) $(XMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(XMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -16917,10 +17491,12 @@ xmldll_xml.o: $(srcdir)/src/xml/xml.cpp xmllib_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $< +xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp + $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $< + # # "make dist" target implementation: -# $Id$ # @@ -16940,6 +17516,7 @@ JPEGDIR = $(WXDIR)/src/jpeg TIFFDIR = $(WXDIR)/src/tiff ZLIBDIR = $(WXDIR)/src/zlib REGEXDIR = $(WXDIR)/src/regex +EXPATDIR = $(WXDIR)/src/expat GTKDIR = $(WXDIR)/src/gtk X11DIR = $(WXDIR)/src/x11 X11INC = $(WXDIR)/include/wx/x11 @@ -17030,6 +17607,16 @@ ALL_DIST: distrib_clean cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex cp $(REGEXDIR)/tests $(DISTDIR)/src/regex + cp -Rf $(EXPATDIR) $(DISTDIR)/src + (cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`) + mkdir $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc # copy some files from include/ that are not installed: mkdir $(DISTDIR)/include mkdir $(DISTDIR)/include/wx @@ -17094,14 +17681,6 @@ ALL_GUI_DIST: ALL_DIST cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff cp $(TIFFDIR)/README $(DISTDIR)/src/tiff - mkdir $(DISTDIR)/src/iodbc - cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc - cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc - cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc - cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc - cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc - cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc - cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc BASE_DIST: ALL_DIST # make --disable-gui the default @@ -17175,6 +17754,8 @@ MOTIF_DIST: ALL_GUI_DIST cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \ $(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \ $(DISTDIR)/include/wx/x11 + mkdir $(DISTDIR)/contrib + cp -R $(WXDIR)/contrib $(DISTDIR) MACX_DIST: ALL_GUI_DIST cp $(INCDIR)/*.* $(DISTDIR)/include @@ -17188,6 +17769,8 @@ MACX_DIST: ALL_GUI_DIST cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile mkdir $(DISTDIR)/src/mac/macsock cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock + mkdir $(DISTDIR)/contrib + cp -R $(WXDIR)/contrib $(DISTDIR) # TODO: Distribute some files COCOA_DIST: ALL_GUI_DIST @@ -17380,6 +17963,11 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs + mkdir $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup + mkdir $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd @@ -17457,6 +18045,12 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc + mkdir $(DISTDIR)/samples/htlbox + cp $(SAMPDIR)/htlbox/Makefile.in $(DISTDIR)/samples/htlbox + cp $(SAMPDIR)/htlbox/makefile.unx $(DISTDIR)/samples/htlbox + cp $(SAMPDIR)/htlbox/*.cpp $(DISTDIR)/samples/htlbox + cp $(SAMPDIR)/htlbox/*.xpm $(DISTDIR)/samples/htlbox + mkdir $(DISTDIR)/samples/html cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html mkdir $(DISTDIR)/samples/html/about @@ -17610,10 +18204,10 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles - mkdir $(DISTDIR)/samples/dialup - cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup - cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup - cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup + mkdir $(DISTDIR)/samples/multimon + cp $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon + cp $(SAMPDIR)/multimon/makefile.unx $(DISTDIR)/samples/multimon + cp $(SAMPDIR)/multimon/*.cpp $(DISTDIR)/samples/multimon mkdir $(DISTDIR)/samples/notebook cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook @@ -17664,6 +18258,11 @@ SAMPLES_DIST: ALL_GUI_DIST # cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource # cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource + mkdir $(DISTDIR)/samples/render + cp $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render + cp $(SAMPDIR)/render/makefile.unx $(DISTDIR)/samples/render + cp $(SAMPDIR)/render/*.cpp $(DISTDIR)/samples/render + mkdir $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate @@ -17814,12 +18413,6 @@ UTILS_DIST: ALL_GUI_DIST cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs - mkdir $(DISTDIR)/utils/makegen - mkdir $(DISTDIR)/utils/makegen/templates - cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen - cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen - cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates - mkdir $(DISTDIR)/utils/hhp2cached cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached