X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a0a8f41e615ce5a25f3900a4e67a9096989556..0699a648f61c50bd7f6bae5465f40492484cdc30:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 50ed76586a..5d0f44340a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -467,6 +467,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/msw/gccpriv.h \
 	wx/msw/libraries.h \
 	wx/msw/mimetype.h \
+	wx/msw/mslu.h \
 	wx/msw/private.h \
 	wx/msw/stackwalk.h \
 	wx/msw/stdpaths.h \
@@ -1542,6 +1543,7 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
 	wx/msw/gccpriv.h \
 	wx/msw/libraries.h \
 	wx/msw/mimetype.h \
+	wx/msw/mslu.h \
 	wx/msw/private.h \
 	wx/msw/stackwalk.h \
 	wx/msw/stdpaths.h \
@@ -2168,7 +2170,6 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/minifram.h \
 	wx/msw/missing.h \
 	wx/msw/msgdlg.h \
-	wx/msw/mslu.h \
 	wx/msw/msvcrt.h \
 	wx/msw/notebook.h \
 	wx/msw/ole/access.h \
@@ -2366,7 +2367,6 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/minifram.h \
 	wx/msw/missing.h \
 	wx/msw/msgdlg.h \
-	wx/msw/mslu.h \
 	wx/msw/msvcrt.h \
 	wx/msw/notebook.h \
 	wx/msw/ole/access.h \
@@ -2678,6 +2678,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/bitmap.h \
 	wx/bookctrl.h \
 	wx/busyinfo.h \
+	wx/generic/busyinfo.h \
 	wx/caret.h \
 	wx/choicebk.h \
 	wx/clipbrd.h \
@@ -2750,6 +2751,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/tbarbase.h \
 	wx/tglbtn.h \
 	wx/tipwin.h \
+	wx/toolbook.h \
 	wx/tooltip.h \
 	wx/toplevel.h \
 	wx/treebase.h \
@@ -3210,6 +3212,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_splitter.o \
 	monodll_textdlgg.o \
 	monodll_tipwin.o \
+	monodll_toolbkg.o \
 	monodll_treectlg.o \
 	monodll_treebkg.o \
 	monodll_vlbox.o \
@@ -3360,6 +3363,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_splitter.o \
 	monodll_textdlgg.o \
 	monodll_tipwin.o \
+	monodll_toolbkg.o \
 	monodll_treectlg.o \
 	monodll_treebkg.o \
 	monodll_vlbox.o \
@@ -4822,6 +4826,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_splitter.o \
 	monolib_textdlgg.o \
 	monolib_tipwin.o \
+	monolib_toolbkg.o \
 	monolib_treectlg.o \
 	monolib_treebkg.o \
 	monolib_vlbox.o \
@@ -4972,6 +4977,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_splitter.o \
 	monolib_textdlgg.o \
 	monolib_tipwin.o \
+	monolib_toolbkg.o \
 	monolib_treectlg.o \
 	monolib_treebkg.o \
 	monolib_vlbox.o \
@@ -6660,6 +6666,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_splitter.o \
 	coredll_textdlgg.o \
 	coredll_tipwin.o \
+	coredll_toolbkg.o \
 	coredll_treectlg.o \
 	coredll_treebkg.o \
 	coredll_vlbox.o \
@@ -6810,6 +6817,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_splitter.o \
 	coredll_textdlgg.o \
 	coredll_tipwin.o \
+	coredll_toolbkg.o \
 	coredll_treectlg.o \
 	coredll_treebkg.o \
 	coredll_vlbox.o \
@@ -7986,6 +7994,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_splitter.o \
 	corelib_textdlgg.o \
 	corelib_tipwin.o \
+	corelib_toolbkg.o \
 	corelib_treectlg.o \
 	corelib_treebkg.o \
 	corelib_vlbox.o \
@@ -8136,6 +8145,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_splitter.o \
 	corelib_textdlgg.o \
 	corelib_tipwin.o \
+	corelib_toolbkg.o \
 	corelib_treectlg.o \
 	corelib_treebkg.o \
 	corelib_vlbox.o \
@@ -14613,6 +14623,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
 
+@COND_USE_GUI_1@monodll_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
+
 @COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
 
@@ -18375,6 +18388,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
 
+@COND_USE_GUI_1@monolib_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
+
 @COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
 
@@ -22521,6 +22537,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
 
+@COND_USE_GUI_1@coredll_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
+
 @COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
 
@@ -25284,6 +25303,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
 
+@COND_USE_GUI_1@corelib_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
+
 @COND_USE_GUI_1@corelib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
 
@@ -26246,7 +26268,7 @@ sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
 
 ############################# Dirs #################################
 
-WXDIR = @abs_top_srcdir@
+WXDIR = $(top_srcdir)
 
 # Subordinate library possibilities
 
@@ -26305,8 +26327,8 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME)
 
 ########################## Tools ###############################
 
-CP_PR = @LNDIR@
-CP_P = $(LN_S) -f
+CP_PR = cp -pR
+CP_P = cp -p
 
 ########################## make dist rules ###############################
 
@@ -26319,6 +26341,7 @@ ALL_DIST: distrib_clean
 	$(CP_P) $(WXDIR)/configure $(DISTDIR)
 	$(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
 	$(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR)
+	$(CP_P) $(WXDIR)/acinclude.m4 $(DISTDIR)
 	$(CP_P) $(WXDIR)/aclocal.m4 $(DISTDIR)
 	$(CP_P) $(WXDIR)/config.sub $(DISTDIR)
 	$(CP_P) $(WXDIR)/config.guess $(DISTDIR)
@@ -26356,7 +26379,6 @@ ALL_DIST: distrib_clean
 	$(CP_P) $(REGEXDIR)/*.c $(DISTDIR)/src/regex
 	$(CP_P) $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
 	$(CP_P) $(REGEXDIR)/README $(DISTDIR)/src/regex
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/src/expat; esac
 	$(CP_PR) $(EXPATDIR) $(DISTDIR)/src/expat
 	#(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
 	mkdir $(DISTDIR)/src/iodbc
@@ -26545,7 +26567,6 @@ GTK_DIST: UNIV_DIST
 	mkdir $(DISTDIR)/include/wx/mac/corefoundation
 	$(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
 
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 X11_DIST: UNIV_DIST
@@ -26560,7 +26581,6 @@ X11_DIST: UNIV_DIST
 	mkdir $(DISTDIR)/include/wx/mac
 	mkdir $(DISTDIR)/include/wx/mac/corefoundation
 	$(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MOTIF_DIST: ALL_GUI_DIST
@@ -26580,7 +26600,6 @@ 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
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MACX_DIST: ALL_GUI_DIST
@@ -26613,7 +26632,6 @@ MACX_DIST: ALL_GUI_DIST
 	$(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
 	$(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
 	$(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 COCOA_DIST: ALL_GUI_DIST
@@ -26628,7 +26646,6 @@ COCOA_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/mac/carbon
 	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
 	$(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/mac/carbon
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MSW_DIST: UNIV_DIST
@@ -26649,7 +26666,6 @@ MSW_DIST: UNIV_DIST
 	$(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	$(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw
 	$(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
@@ -26671,7 +26687,6 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	$(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
 	$(CP_P) $(SRCDIR)/*.??? $(DISTDIR)/src
 	$(CP_P) $(SRCDIR)/*.?? $(DISTDIR)/src
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 UNIV_DIST: ALL_GUI_DIST
@@ -26692,7 +26707,6 @@ MGL_DIST: UNIV_DIST
 	$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
 	mkdir $(DISTDIR)/src/msdos
 	$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 DEMOS_DIST: ALL_GUI_DIST
@@ -26709,7 +26723,6 @@ DEMOS_DIST: ALL_GUI_DIST
 	$(CP_P) $(DEMODIR)/bombs/*.rc $(DISTDIR)/demos/bombs
 	$(CP_P) $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 
-	case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/demos/dbbrowse; esac
 	$(CP_PR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
 
 	mkdir $(DISTDIR)/demos/forty