From ffa7b75018a936c23a7c55c47155929be647a6c9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 26 May 2012 12:29:44 +0000 Subject: [PATCH 1/1] Remove private headers from files.bkl. Private headers are not supposed to be installed because they are only use when building wxWidgets itself, so don't list them in files.bkl. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 27 +++++---------------------- build/bakefiles/files.bkl | 6 ------ build/msw/wx_net.dsp | 4 ---- build/msw/wx_vc7_net.vcproj | 3 --- build/msw/wx_vc8_net.vcproj | 4 ---- build/msw/wx_vc9_net.vcproj | 4 ---- 6 files changed, 5 insertions(+), 43 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0781fd86f6..49bb8e47df 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2335,7 +2335,6 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR = \ 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 \ @@ -2356,7 +2355,6 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ 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 \ @@ -2389,8 +2387,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ 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 \ @@ -2412,8 +2409,7 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ 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 \ @@ -2435,8 +2431,7 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ 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 \ @@ -2458,8 +2453,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ 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 \ @@ -2481,8 +2475,7 @@ COND_TOOLKIT__BASE_OSX_HDR = \ 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 @@ -2626,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 \ @@ -3184,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 @@ -3293,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 \ @@ -3403,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 \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 95db06d323..1e08f1cd5e 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -200,7 +200,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/core/objcid.h wx/osx/core/private.h wx/osx/core/stdpaths.h - wx/osx/core/private/strconv_cf.h @@ -565,7 +564,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/urlmsw.cpp - wx/msw/private/sockmsw.h @@ -1110,7 +1108,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! 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 @@ -2453,9 +2450,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! 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 diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp index 48dbf92ec8..6a940c9576 100644 --- a/build/msw/wx_net.dsp +++ b/build/msw/wx_net.dsp @@ -571,10 +571,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h !ENDIF -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\private\sockmsw.h # End Source File # End Group # Begin Group "Common Headers" diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj index a779d09eb9..053531361e 100644 --- a/build/msw/wx_vc7_net.vcproj +++ b/build/msw/wx_vc7_net.vcproj @@ -803,9 +803,6 @@ AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""/> - - - - - -