fixes for wxBase dist and install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
22b41d3e01
commit
84a32a7796
22
Makefile.in
22
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 "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
|
||||||
@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; 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/protocol
|
||||||
$(INSTALL) -d $(includedir)/wx/unix
|
$(INSTALL) -d $(includedir)/wx/unix
|
||||||
@list='$(HEADERS)'; for p in $$list; do \
|
@list='$(HEADERS)'; for p in $$list; do \
|
||||||
@ -532,8 +535,6 @@ ALL_DIST: distclean
|
|||||||
mkdir $(DISTDIR)
|
mkdir $(DISTDIR)
|
||||||
cp $(WXDIR)/wxwin.m4 $(DISTDIR)
|
cp $(WXDIR)/wxwin.m4 $(DISTDIR)
|
||||||
cp $(WXDIR)/aclocal.m4 $(DISTDIR)
|
cp $(WXDIR)/aclocal.m4 $(DISTDIR)
|
||||||
cp $(WXDIR)/configure.in $(DISTDIR)
|
|
||||||
cp $(WXDIR)/configure $(DISTDIR)
|
|
||||||
cp $(WXDIR)/config.sub $(DISTDIR)
|
cp $(WXDIR)/config.sub $(DISTDIR)
|
||||||
cp $(WXDIR)/config.guess $(DISTDIR)
|
cp $(WXDIR)/config.guess $(DISTDIR)
|
||||||
cp $(WXDIR)/install-sh $(DISTDIR)
|
cp $(WXDIR)/install-sh $(DISTDIR)
|
||||||
@ -543,11 +544,11 @@ ALL_DIST: distclean
|
|||||||
cp $(WXDIR)/setup.h_vms $(DISTDIR)
|
cp $(WXDIR)/setup.h_vms $(DISTDIR)
|
||||||
cp $(WXDIR)/descrip.mms $(DISTDIR)
|
cp $(WXDIR)/descrip.mms $(DISTDIR)
|
||||||
cp $(WXDIR)/Makefile.in $(DISTDIR)
|
cp $(WXDIR)/Makefile.in $(DISTDIR)
|
||||||
|
cp $(WXDIR)/wxBase.spec $(DISTDIR)
|
||||||
cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
|
cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
|
||||||
cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
|
cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
|
||||||
cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
|
cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
|
||||||
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
|
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
|
||||||
cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
|
|
||||||
mkdir $(DISTDIR)/lib
|
mkdir $(DISTDIR)/lib
|
||||||
cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
|
cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
|
||||||
cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
|
cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
|
||||||
@ -572,7 +573,9 @@ ALL_DIST: distclean
|
|||||||
# this target is the common part of distribution script for all GUI toolkits,
|
# this target is the common part of distribution script for all GUI toolkits,
|
||||||
# but is not used when building wxBase distribution
|
# but is not used when building wxBase distribution
|
||||||
ALL_GUI_DIST: ALL_DIST
|
ALL_GUI_DIST: ALL_DIST
|
||||||
cp $(WXDIR)/wxBase.spec $(DISTDIR)
|
cp $(WXDIR)/configure.in $(DISTDIR)
|
||||||
|
cp $(WXDIR)/configure $(DISTDIR)
|
||||||
|
cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
|
||||||
cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
|
cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
|
||||||
if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
|
if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
|
||||||
cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
|
cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
|
||||||
@ -636,19 +639,25 @@ ALL_GUI_DIST: ALL_DIST
|
|||||||
cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
|
cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
|
||||||
|
|
||||||
BASE_DIST: ALL_DIST
|
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
|
||||||
mkdir $(DISTDIR)/include/wx
|
mkdir $(DISTDIR)/include/wx
|
||||||
mkdir $(DISTDIR)/include/wx/protocol
|
mkdir $(DISTDIR)/include/wx/protocol
|
||||||
mkdir $(DISTDIR)/include/wx/unix
|
mkdir $(DISTDIR)/include/wx/unix
|
||||||
|
mkdir $(DISTDIR)/include/wx/msw
|
||||||
mkdir $(DISTDIR)/src/common
|
mkdir $(DISTDIR)/src/common
|
||||||
mkdir $(DISTDIR)/src/unix
|
mkdir $(DISTDIR)/src/unix
|
||||||
mkdir $(DISTDIR)/src/msw
|
mkdir $(DISTDIR)/src/msw
|
||||||
cp $(WXDIR)/wxBase.spec $(DISTDIR)
|
|
||||||
cp @PORT_FILES@ $(DISTDIR)
|
cp @PORT_FILES@ $(DISTDIR)
|
||||||
cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
|
cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
|
||||||
cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
|
cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
|
||||||
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
|
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 $(SRCDIR)/*.in $(DISTDIR)/src
|
||||||
cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
|
cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
|
||||||
cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
|
cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
|
||||||
@ -669,6 +678,7 @@ BASE_DIST: ALL_DIST
|
|||||||
cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
|
cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
|
||||||
cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
|
cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
|
||||||
cp $(SAMPDIR)/console/console.cpp $(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
|
cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
|
||||||
|
|
||||||
GTK_DIST: ALL_GUI_DIST
|
GTK_DIST: ALL_GUI_DIST
|
||||||
|
Loading…
Reference in New Issue
Block a user