X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/772513d82432ecf323bca55251551fd5c8a7562d..62795f413a7222863b4aee76c08764071f94bd87:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 37da0a5379..f38bb22b20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3001,8 +3001,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \ wx/gtk/textctrl.h \ wx/gtk/textentry.h \ wx/gtk/tglbtn.h \ - wx/generic/fontdlgg.h \ - wx/gtk/gnome/gprint.h + wx/generic/fontdlgg.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR = \ wx/generic/fdrepdlg.h \ @@ -5642,8 +5641,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_gtk_textentry.o \ monodll_gtk_tglbtn.o \ monodll_treeentry_gtk.o \ - monodll_fontdlgg.o \ - monodll_gprint.o + monodll_fontdlgg.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS = \ monodll_generic_accel.o \ @@ -7891,8 +7889,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_gtk_textentry.o \ monolib_gtk_tglbtn.o \ monolib_treeentry_gtk.o \ - monolib_fontdlgg.o \ - monolib_gprint.o + monolib_fontdlgg.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_1 = \ monolib_generic_accel.o \ @@ -10314,8 +10311,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_gtk_textentry.o \ coredll_gtk_tglbtn.o \ coredll_treeentry_gtk.o \ - coredll_fontdlgg.o \ - coredll_gprint.o + coredll_fontdlgg.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_2 = \ coredll_generic_accel.o \ @@ -11992,8 +11988,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_gtk_textentry.o \ corelib_gtk_tglbtn.o \ corelib_treeentry_gtk.o \ - corelib_fontdlgg.o \ - corelib_gprint.o + corelib_fontdlgg.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_3 = \ corelib_generic_accel.o \ @@ -17329,9 +17324,6 @@ monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP) monodll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp -monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp - monodll_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp @@ -23200,9 +23192,6 @@ monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP) monolib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp -monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp - monolib_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp @@ -29806,9 +29795,6 @@ coredll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(COREDLL_ODEP) coredll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp - coredll_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp @@ -34186,9 +34172,6 @@ corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP) corelib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp - corelib_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp @@ -40701,7 +40684,6 @@ ALL_DIST: distrib_clean $(CP_P) $(WXDIR)/setup.h_vms $(DISTDIR) $(CP_P) $(WXDIR)/descrip.mms $(DISTDIR) $(CP_P) $(WXDIR)/Makefile.in $(DISTDIR) - $(CP_P) $(WXDIR)/wxBase.spec $(DISTDIR) $(CP_P) $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt $(CP_P) $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt @@ -40941,7 +40923,6 @@ BASE_DIST: ALL_DIST INTL_DIST mv $(DISTDIR) $(BASEDISTDIR) GTK_DIST: UNIV_DIST - $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk $(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk $(CP_P) $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk @@ -40977,7 +40958,6 @@ GTK_DIST: UNIV_DIST $(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core 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 @@ -40994,7 +40974,6 @@ X11_DIST: UNIV_DIST $(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core MOTIF_DIST: ALL_GUI_DIST - $(CP_P) $(WXDIR)/wxMotif.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif $(CP_P) $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif $(CP_P) $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif @@ -41482,59 +41461,6 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp -@IF_GNU_MAKE@debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@ -@IF_GNU_MAKE@debian-dist: debian-native-dist debian-msw-dirs MSW_DIST -@IF_GNU_MAKE@ mkdir $(DISTDIR)/debian -@IF_GNU_MAKE@ -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian -@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs -@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs -@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs -@IF_GNU_MAKE@ rm -f $(DISTDIR)/*.spec -@IF_GNU_MAKE@ -@IF_GNU_MAKE@ @# now prune away a lot of the crap included by using cp -R -@IF_GNU_MAKE@ @# in other dist targets. Ugly and hardly portable but it -@IF_GNU_MAKE@ @# will run on any Debian box and that's enough for now. -@IF_GNU_MAKE@ -@IF_GNU_MAKE@ find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \ -@IF_GNU_MAKE@ -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \ -@IF_GNU_MAKE@ -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \ -@IF_GNU_MAKE@ -o -name "*.pro" \ -@IF_GNU_MAKE@ -o -name "*.vpj" \ -@IF_GNU_MAKE@ -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \ -@IF_GNU_MAKE@ \) -print0 | xargs -0 rm -rf -@IF_GNU_MAKE@ -@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/SWIG -@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/distrib -@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/distutils -@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/samples -@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/contrib/iewin -@IF_GNU_MAKE@ find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf -@IF_GNU_MAKE@ -@IF_GNU_MAKE@ rm -rf $(DEBIAN_SOURCE_DIR) -@IF_GNU_MAKE@ mv $(DISTDIR) $(DEBIAN_SOURCE_DIR) - - -@IF_GNU_MAKE@debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST - -@IF_GNU_MAKE@debian-msw-dirs: -@IF_GNU_MAKE@ mkdir $(DISTDIR)/include/wx/msw -@IF_GNU_MAKE@ mkdir $(DISTDIR)/src/msw - - -RPMTOP=_dist_dir/_rpm_top - -rpm: bzip-dist - @echo "*** Building RPMs ***" - -mkdir $(RPMTOP) - -mkdir $(RPMTOP)/SOURCES - -mkdir $(RPMTOP)/SPECS - -mkdir $(RPMTOP)/BUILD - -mkdir $(RPMTOP)/RPMS - -mkdir $(RPMTOP)/SRPMS - cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES - rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec - mv -f `find $(RPMTOP) -name "wx-*.rpm"` . - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d