X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4758baf5eb87bd1f1251a21e3fa8e5d658b9a3b6..f40f8e17226c2080dec017e2043fe59e2d21e15b:/Makefile.in diff --git a/Makefile.in b/Makefile.in index c10f4f28d5..49bb8e47df 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1841,7 +1841,8 @@ AUIDLL_OBJECTS = \ auidll_auibook.o \ auidll_auibar.o \ auidll_tabmdi.o \ - auidll_tabart.o + auidll_tabart.o \ + $(__AUI_GTK_SRC_OBJECTS_2) AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname) AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -1855,7 +1856,8 @@ AUILIB_OBJECTS = \ auilib_auibook.o \ auilib_auibar.o \ auilib_tabmdi.o \ - auilib_tabart.o + auilib_tabart.o \ + $(__AUI_GTK_SRC_OBJECTS_3) AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname) RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -2124,9 +2126,9 @@ COND_USE_STC_1___wxscintilla___depname = \ @COND_PLATFORM_MACOSX_1@WEBVIEW_HDR_PLATFORM = \ @COND_PLATFORM_MACOSX_1@ wx/osx/webviewhistoryitem_webkit.h \ @COND_PLATFORM_MACOSX_1@ wx/osx/webview_webkit.h -@COND_PLATFORM_UNIX_1@WEBVIEW_HDR_PLATFORM = \ -@COND_PLATFORM_UNIX_1@ wx/gtk/webviewhistoryitem_webkit.h \ -@COND_PLATFORM_UNIX_1@ wx/gtk/webview_webkit.h +@COND_TOOLKIT_GTK@WEBVIEW_HDR_PLATFORM = \ +@COND_TOOLKIT_GTK@ wx/gtk/webviewhistoryitem_webkit.h \ +@COND_TOOLKIT_GTK@ wx/gtk/webview_webkit.h @COND_TOOLKIT_MSW@WEBVIEW_HDR_PLATFORM = \ @COND_TOOLKIT_MSW@ wx/msw/webviewhistoryitem_ie.h wx/msw/webview_ie.h @COND_TOOLKIT_OSX_CARBON@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h @@ -2140,6 +2142,7 @@ COND_USE_STC_1___wxscintilla___depname = \ @COND_TOOLKIT_WINCE@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h @COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_GTK_HDR = wx/aui/tabartgtk.h COND_TOOLKIT_OSX_CARBON_BASE_OSX_SRC = \ src/osx/core/mimetype.cpp \ src/osx/core/cfstring.cpp \ @@ -2329,9 +2332,9 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ - wx/osx/core/private/strconv_cf.h \ wx/unix/app.h \ wx/unix/apptbase.h \ wx/unix/apptrait.h \ @@ -2349,9 +2352,9 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ - wx/osx/core/private/strconv_cf.h \ wx/unix/app.h \ wx/unix/apptbase.h \ wx/unix/apptrait.h \ @@ -2382,9 +2385,9 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h \ - wx/osx/core/private/strconv_cf.h + wx/osx/core/stdpaths.h @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR) COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2404,9 +2407,9 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h \ - wx/osx/core/private/strconv_cf.h + wx/osx/core/stdpaths.h @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR) COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2426,9 +2429,9 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h \ - wx/osx/core/private/strconv_cf.h + wx/osx/core/stdpaths.h @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR) COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2448,9 +2451,9 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h \ - wx/osx/core/private/strconv_cf.h + wx/osx/core/stdpaths.h @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR) COND_TOOLKIT__BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2470,9 +2473,9 @@ COND_TOOLKIT__BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h \ - wx/osx/core/private/strconv_cf.h + wx/osx/core/stdpaths.h @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR) @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR) @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h @@ -2616,7 +2619,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR = \ wx/gtk/nonownedwnd.h \ wx/gtk/pen.h \ wx/gtk/popupwin.h \ - wx/gtk/private/win_gtk.h \ wx/gtk/region.h \ wx/gtk/tooltip.h \ wx/gtk/toplevel.h \ @@ -3024,7 +3026,6 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/rcdefs.h \ wx/msw/richmsgdlg.h \ wx/msw/scrolbar.h \ - wx/msw/setup0.h \ wx/msw/slider.h \ wx/msw/spinbutt.h \ wx/msw/spinctrl.h \ @@ -3175,9 +3176,6 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR = \ wx/osx/carbon/chkconf.h \ wx/osx/carbon/evtloop.h \ wx/osx/carbon/private.h \ - wx/osx/carbon/private/mactext.h \ - wx/osx/carbon/private/overlay.h \ - wx/osx/carbon/private/print.h \ wx/osx/carbon/region.h \ wx/osx/carbon/statbmp.h \ wx/osx/carbon/uma.h @@ -3284,9 +3282,6 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \ wx/osx/carbon/chkconf.h \ wx/osx/carbon/evtloop.h \ wx/osx/carbon/private.h \ - wx/osx/carbon/private/mactext.h \ - wx/osx/carbon/private/overlay.h \ - wx/osx/carbon/private/print.h \ wx/osx/carbon/region.h \ wx/osx/carbon/statbmp.h \ wx/osx/carbon/uma.h \ @@ -3394,9 +3389,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \ wx/osx/carbon/chkconf.h \ wx/osx/carbon/evtloop.h \ wx/osx/carbon/private.h \ - wx/osx/carbon/private/mactext.h \ - wx/osx/carbon/private/overlay.h \ - wx/osx/carbon/private/print.h \ wx/osx/carbon/region.h \ wx/osx/carbon/statbmp.h \ wx/osx/carbon/uma.h \ @@ -3463,7 +3455,6 @@ COND_TOOLKIT_PM_GUI_HDR = \ wx/os2/region.h \ wx/os2/scrolbar.h \ wx/os2/settings.h \ - wx/os2/setup0.h \ wx/os2/slider.h \ wx/os2/spinbutt.h \ wx/os2/spinctrl.h \ @@ -3554,7 +3545,6 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/rcdefs.h \ wx/msw/richmsgdlg.h \ wx/msw/scrolbar.h \ - wx/msw/setup0.h \ wx/msw/slider.h \ wx/msw/spinbutt.h \ wx/msw/spinctrl.h \ @@ -4201,6 +4191,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/aui/tabmdi.h \ wx/aui/aui.h \ wx/aui/tabart.h \ + $(AUI_GTK_HDR) \ wx/propgrid/advprops.h \ wx/propgrid/editors.h \ wx/propgrid/manager.h \ @@ -4518,6 +4509,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_auibar.o \ monodll_tabmdi.o \ monodll_tabart.o \ + $(__AUI_GTK_SRC_OBJECTS) \ monodll_advprops.o \ monodll_editors.o \ monodll_manager.o \ @@ -6185,9 +6177,11 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \ @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = monodll_osx_webview_webkit.o -@COND_PLATFORM_UNIX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS \ -@COND_PLATFORM_UNIX_1@ = monodll_gtk_webview_webkit.o +@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS = \ +@COND_TOOLKIT_GTK@ monodll_gtk_webview_webkit.o @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \ +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_tabartgtk.o @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \ @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monodll_sound_sdl.o @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o @@ -6413,6 +6407,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_auibar.o \ monolib_tabmdi.o \ monolib_tabart.o \ + $(__AUI_GTK_SRC_OBJECTS_1) \ monolib_advprops.o \ monolib_editors.o \ monolib_manager.o \ @@ -8082,9 +8077,11 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 \ @COND_PLATFORM_MACOSX_1@ = monolib_osx_webview_webkit.o -@COND_PLATFORM_UNIX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 \ -@COND_PLATFORM_UNIX_1@ = monolib_gtk_webview_webkit.o +@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \ +@COND_TOOLKIT_GTK@ monolib_gtk_webview_webkit.o @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \ +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_tabartgtk.o @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \ @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o COND_MONOLITHIC_0_SHARED_1___basedll___depname = \ @@ -12138,8 +12135,8 @@ COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \ @COND_PLATFORM_WIN32_1@__webviewdll___win32rc = webviewdll_version_rc.o @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 \ @COND_PLATFORM_MACOSX_1@ = webviewdll_osx_webview_webkit.o -@COND_PLATFORM_UNIX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 \ -@COND_PLATFORM_UNIX_1@ = webviewdll_gtk_webview_webkit.o +@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \ +@COND_TOOLKIT_GTK@ webviewdll_gtk_webview_webkit.o @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \ @COND_TOOLKIT_MSW@ webviewdll_webview_ie.o COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \ @@ -12157,8 +12154,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \ @COND_USE_PCH_1@ = ./.pch/wxprec_webviewlib/wx/wxprec.h.gch @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 \ @COND_PLATFORM_MACOSX_1@ = webviewlib_osx_webview_webkit.o -@COND_PLATFORM_UNIX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 \ -@COND_PLATFORM_UNIX_1@ = webviewlib_gtk_webview_webkit.o +@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \ +@COND_TOOLKIT_GTK@ webviewlib_gtk_webview_webkit.o @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \ @COND_TOOLKIT_MSW@ webviewlib_webview_ie.o @COND_SHARED_1@____wxwebview_namedll_DEP = $(__webviewdll___depname) @@ -12469,6 +12466,8 @@ COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_cmd = rm -f \ $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_USE_SOVERSOLARIS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_cmd) @COND_PLATFORM_WIN32_1@__auidll___win32rc = auidll_version_rc.o +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_2 \ +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = auidll_tabartgtk.o COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__auilib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname) @@ -12481,6 +12480,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \ @COND_ICC_PCH_1@ ./.pch/wxprec_auilib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_auilib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_auilib/wx/wxprec.h.gch +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_3 \ +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = auilib_tabartgtk.o @COND_SHARED_1@____wxaui_namedll_DEP = $(__auidll___depname) @COND_SHARED_0@____wxaui_namelib_DEP = $(__auilib___depname) COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1___ribbondll___depname = \ @@ -14667,7 +14668,7 @@ install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config - (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale @@ -17411,6 +17412,9 @@ monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP) monodll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp +monodll_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp + monodll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp @@ -22712,6 +22716,9 @@ monolib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONOLIB_ODEP) monolib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp +monolib_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp + monolib_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp @@ -36476,6 +36483,9 @@ auidll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUIDLL_ODEP) auidll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUIDLL_ODEP) $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp +auidll_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(AUIDLL_ODEP) + $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp + auilib_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUILIB_ODEP) $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp @@ -36497,6 +36507,9 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP) auilib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUILIB_ODEP) $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp +auilib_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(AUILIB_ODEP) + $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp + ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON @@ -37177,6 +37190,8 @@ GTK_DIST: UNIV_DIST $(CP_P) $(GTK1DIR)/*.c $(DISTDIR)/src/gtk1 $(CP_P) $(GTK1DIR)/*.xbm $(DISTDIR)/src/gtk1 $(CP_P) $(GTK1DIR)/*.mms $(DISTDIR)/src/gtk1 + mkdir $(DISTDIR)/include/wx/x11/private + $(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private mkdir $(DISTDIR)/include/wx/gtk/gnome mkdir $(DISTDIR)/src/gtk/gnome @@ -37198,6 +37213,8 @@ GTK_DIST: UNIV_DIST X11_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11 + mkdir $(DISTDIR)/include/wx/x11/private + $(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private mkdir $(DISTDIR)/include/wx/gtk/private $(CP_P) $(INCDIR)/wx/gtk/private/string.h $(DISTDIR)/include/wx/gtk/private $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11 @@ -37227,6 +37244,8 @@ MOTIF_DIST: ALL_GUI_DIST $(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \ $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \ $(DISTDIR)/include/wx/x11 + mkdir $(DISTDIR)/include/wx/x11/private + $(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private OSX_CARBON_DIST: ALL_GUI_DIST $(CP_P) $(INCDIR)/*.* $(DISTDIR)/include