X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debc175a423a4d15a89275ef957c33da1c783ce3..c16d276354b116475bf85a0388b4b0f545da0f82:/Makefile.in diff --git a/Makefile.in b/Makefile.in index ddb8121778..505275cb01 100644 --- a/Makefile.in +++ b/Makefile.in @@ -436,6 +436,9 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi + @# always install msw headers for wxBase, it's much simpler + @if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi + $(INSTALL) -d $(includedir)/wx/protocol $(INSTALL) -d $(includedir)/wx/unix @list='$(HEADERS)'; for p in $$list; do \ @@ -532,8 +535,6 @@ ALL_DIST: distclean mkdir $(DISTDIR) cp $(WXDIR)/wxwin.m4 $(DISTDIR) cp $(WXDIR)/aclocal.m4 $(DISTDIR) - cp $(WXDIR)/configure.in $(DISTDIR) - cp $(WXDIR)/configure $(DISTDIR) cp $(WXDIR)/config.sub $(DISTDIR) cp $(WXDIR)/config.guess $(DISTDIR) cp $(WXDIR)/install-sh $(DISTDIR) @@ -543,11 +544,11 @@ ALL_DIST: distclean cp $(WXDIR)/setup.h_vms $(DISTDIR) cp $(WXDIR)/descrip.mms $(DISTDIR) cp $(WXDIR)/Makefile.in $(DISTDIR) + cp $(WXDIR)/wxBase.spec $(DISTDIR) cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt - cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt mkdir $(DISTDIR)/lib cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib @@ -556,7 +557,6 @@ ALL_DIST: distclean mkdir $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib - cp $(ZLIBDIR)/*.mcp $(DISTDIR)/src/zlib cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib mkdir $(DISTDIR)/src/regex @@ -573,8 +573,10 @@ ALL_DIST: distclean # this target is the common part of distribution script for all GUI toolkits, # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST - cp $(WXDIR)/wxBase.spec $(DISTDIR) - cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt + cp $(WXDIR)/configure.in $(DISTDIR) + cp $(WXDIR)/configure $(DISTDIR) + cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt + cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt @@ -621,15 +623,12 @@ ALL_GUI_DIST: ALL_DIST cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps cp $(PNGDIR)/*.h $(DISTDIR)/src/png cp $(PNGDIR)/*.c $(DISTDIR)/src/png - cp $(PNGDIR)/*.mcp $(DISTDIR)/src/png cp $(PNGDIR)/README $(DISTDIR)/src/png cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg - cp $(JPEGDIR)/*.mcp $(DISTDIR)/src/jpeg cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff - cp $(TIFFDIR)/*.mcp $(DISTDIR)/src/tiff cp $(TIFFDIR)/README $(DISTDIR)/src/tiff cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc @@ -640,19 +639,25 @@ ALL_GUI_DIST: ALL_DIST cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc BASE_DIST: ALL_DIST + # make --disable-gui the default + sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ + $(WXDIR)/configure.in > $(DISTDIR)/configure.in + sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ + $(WXDIR)/configure > $(DISTDIR)/configure + chmod +x $(DISTDIR)/configure mkdir $(DISTDIR)/include mkdir $(DISTDIR)/include/wx mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/unix + mkdir $(DISTDIR)/include/wx/msw mkdir $(DISTDIR)/src/common mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/msw - cp $(WXDIR)/wxBase.spec $(DISTDIR) cp @PORT_FILES@ $(DISTDIR) cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR) cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR) cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt - cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt + cp $(DOCDIR)/install.txt $(DISTDIR)/README.txt cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common @@ -673,6 +678,7 @@ BASE_DIST: ALL_DIST cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console + cp $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console GTK_DIST: ALL_GUI_DIST @@ -702,7 +708,6 @@ MOTIF_DIST: ALL_GUI_DIST MACX_DIST: ALL_GUI_DIST cp $(INCDIR)/*.* $(DISTDIR)/include cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac - cp $(SRCDIR)/*.mcp $(DISTDIR)/src cp $(MACDIR)/files.lst $(DISTDIR)/src/mac cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac cp $(MACDIR)/*.c $(DISTDIR)/src/mac @@ -711,14 +716,6 @@ MACX_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/src/mac/morefile cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile - mkdir $(DISTDIR)/src/mac/cdef - cp $(MACDIR)/cdef/*.h $(DISTDIR)/src/mac/cdef - cp $(MACDIR)/cdef/*.c $(DISTDIR)/src/mac/cdef - cp $(MACDIR)/cdef/*.mcp $(DISTDIR)/src/mac/cdef - mkdir $(DISTDIR)/src/mac/ldef - cp $(MACDIR)/ldef/*.h $(DISTDIR)/src/mac/ldef - cp $(MACDIR)/ldef/*.c $(DISTDIR)/src/mac/ldef - cp $(MACDIR)/ldef/*.mcp $(DISTDIR)/src/mac/cdef mkdir $(DISTDIR)/src/mac/macsock cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock @@ -761,8 +758,6 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/configure $(DISTDIR)/demos cp $(DEMODIR)/configure.in $(DISTDIR)/demos - cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse - mkdir $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs @@ -771,6 +766,8 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs + cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse + mkdir $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty @@ -813,7 +810,6 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/calendar cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar - cp $(SAMPDIR)/calendar/*.mcp $(DISTDIR)/samples/calendar cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar mkdir $(DISTDIR)/samples/caret @@ -825,7 +821,6 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst - cp $(SAMPDIR)/checklst/*.mcp $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst @@ -833,7 +828,6 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/config cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config - cp $(SAMPDIR)/config/*.mcp $(DISTDIR)/samples/config cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config mkdir $(DISTDIR)/samples/console @@ -845,7 +839,6 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/controls/icons cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls - cp $(SAMPDIR)/controls/*.mcp $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls @@ -861,7 +854,6 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs - cp $(SAMPDIR)/dialogs/*.mcp $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs @@ -1319,6 +1311,7 @@ MANUAL_DIST: PYTHON_DIST: mkdir $(DISTDIR)/wxPython mkdir $(DISTDIR)/wxPython/contrib + mkdir $(DISTDIR)/wxPython/contrib/gizmos mkdir $(DISTDIR)/wxPython/contrib/glcanvas mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk mkdir $(DISTDIR)/wxPython/contrib/ogl @@ -1339,6 +1332,7 @@ PYTHON_DIST: cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython + cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos -cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl