AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for 'make dist' to include headers for all ports

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-09-22 16:22:31 +00:00
parent cae8f1bf03
commit 2b5e2b5847
4 changed files with 193 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
Makefile.in
View File

@ -215,7 +215,7 @@ WXEXPAT_OBJECTS = \
wxexpat_xmlrole.o \
wxexpat_xmltok.o
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
ALL_BASE_HEADERS = \
ALL_HEADERS = \
wx/afterstd.h \
wx/app.h \
wx/apptrait.h \
@ -337,10 +337,164 @@ ALL_BASE_HEADERS = \
wx/xtixml.h \
wx/db.h \
wx/dbkeyg.h \
wx/dbtable.h
ALL_HEADERS = \
$(ALL_BASE_HEADERS) \
wx/dbtable.h \
$(ALL_GUI_HEADERS)
ALL_BASE_HEADERS = \
wx/afterstd.h \
wx/app.h \
wx/apptrait.h \
wx/archive.h \
wx/arrimpl.cpp \
wx/arrstr.h \
wx/beforestd.h \
wx/buffer.h \
wx/build.h \
wx/chkconf.h \
wx/clntdata.h \
wx/cmdline.h \
wx/confbase.h \
wx/config.h \
wx/containr.h \
wx/datetime.h \
wx/datstrm.h \
wx/dde.h \
wx/debug.h \
wx/defs.h \
wx/dir.h \
wx/dlimpexp.h \
wx/dynarray.h \
wx/dynlib.h \
wx/dynload.h \
wx/encconv.h \
wx/event.h \
wx/except.h \
wx/features.h \
wx/ffile.h \
wx/file.h \
wx/fileconf.h \
wx/filefn.h \
wx/filename.h \
wx/filesys.h \
wx/fontenc.h \
wx/fontmap.h \
wx/fs_mem.h \
wx/fs_zip.h \
wx/hash.h \
wx/hashmap.h \
wx/hashset.h \
wx/html/forcelnk.h \
wx/iconloc.h \
wx/init.h \
wx/intl.h \
wx/iosfwrap.h \
wx/ioswrap.h \
wx/ipc.h \
wx/ipcbase.h \
wx/isql.h \
wx/isqlext.h \
wx/list.h \
wx/listimpl.cpp \
wx/log.h \
wx/longlong.h \
wx/math.h \
wx/memconf.h \
wx/memory.h \
wx/memtext.h \
wx/mimetype.h \
wx/module.h \
wx/msgout.h \
wx/mstream.h \
wx/object.h \
wx/platform.h \
wx/process.h \
wx/ptr_scpd.h \
wx/recguard.h \
wx/regex.h \
wx/scopeguard.h \
wx/snglinst.h \
wx/sstream.h \
wx/stack.h \
wx/stackwalk.h \
wx/stdpaths.h \
wx/stockitem.h \
wx/stopwatch.h \
wx/strconv.h \
wx/stream.h \
wx/string.h \
wx/sysopt.h \
wx/textbuf.h \
wx/textfile.h \
wx/thread.h \
wx/thrimpl.cpp \
wx/timer.h \
wx/tokenzr.h \
wx/txtstrm.h \
wx/types.h \
wx/uri.h \
wx/utils.h \
wx/variant.h \
wx/vector.h \
wx/version.h \
wx/volume.h \
wx/wfstream.h \
wx/wx.h \
wx/wxchar.h \
wx/wxprec.h \
wx/xti.h \
wx/xtistrm.h \
wx/zipstrm.h \
wx/zstream.h \
wx/unix/apptbase.h \
wx/unix/apptrait.h \
wx/unix/execute.h \
wx/unix/mimetype.h \
wx/unix/pipe.h \
wx/unix/stackwalk.h \
wx/unix/stdpaths.h \
wx/msw/apptrait.h \
wx/msw/apptbase.h \
wx/msw/chkconf.h \
wx/msw/crashrpt.h \
wx/msw/dde.h \
wx/msw/debughlp.h \
wx/msw/gccpriv.h \
wx/msw/mimetype.h \
wx/msw/stackwalk.h \
wx/msw/stdpaths.h \
wx/msw/winundef.h \
wx/msw/wrapcctl.h \
wx/msw/wrapcdlg.h \
wx/msw/wrapwin.h \
$(BASE_WINCE_HDR) \
$(BASE_MACOSX_HDR) \
wx/palmos/apptbase.h \
wx/palmos/apptrait.h \
wx/palmos/chkconf.h \
wx/palmos/mimetype.h \
wx/palmos/stdpaths.h \
wx/msdos/mimetype.h \
wx/fs_inet.h \
wx/gsocket.h \
wx/protocol/file.h \
wx/protocol/ftp.h \
wx/protocol/http.h \
wx/protocol/protocol.h \
wx/sckaddr.h \
wx/sckipc.h \
wx/sckstrm.h \
wx/socket.h \
wx/url.h \
wx/unix/gsockunx.h \
wx/msw/gsockmsw.h \
$(NET_WINCE_HDR) \
wx/unix/gsockunx.h \
wx/unix/gsockunx.h \
wx/mac/carbon/gsockmac.h \
wx/xml/xml.h \
wx/xtixml.h \
wx/db.h \
wx/dbkeyg.h \
wx/dbtable.h
ALL_BASE_SOURCES = \
src/common/appbase.cpp \
src/common/archive.cpp \
@ -24179,6 +24333,7 @@ X11DIR = $(WXDIR)/src/x11
X11INC = $(WXDIR)/include/wx/x11
MGLDIR = $(WXDIR)/src/mgl
MOTIFDIR = $(WXDIR)/src/motif
MSDOSDIR = $(WXDIR)/src/msdos
MSWDIR = $(WXDIR)/src/msw
PMDIR = $(WXDIR)/src/os2
MACDIR = $(WXDIR)/src/mac
@ -24359,9 +24514,11 @@ BASE_DIST: ALL_DIST
mkdir $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/include/wx/xml
mkdir $(DISTDIR)/include/wx/msdos
mkdir $(DISTDIR)/include/wx/msw
mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/src/unix
mkdir $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/src/msw
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
@ -24536,8 +24693,12 @@ UNIV_DIST: ALL_GUI_DIST
MGL_DIST: UNIV_DIST
cp $(WXDIR)/wxMGL.spec $(DISTDIR)
cp $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
mkdir $(DISTDIR)/include/wx/msdos
cp $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
cp $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
cp $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
mkdir $(DISTDIR)/src/msdos
cp $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/contrib
cp -R $(WXDIR)/contrib $(DISTDIR)

24
build/bakefiles/files.bkl
View File

@ -2960,17 +2960,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</if>
</set>
<set var="ALL_BASE_HEADERS" make_var="1" hints="files">
<!-- for 'make install', only the headers needed for the installed port -->
<set var="ALL_HEADERS" make_var="1" hints="files">
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
$(NET_CMN_HDR) $(NET_PLATFORM_HDR)
$(XML_HDR) $(ODBC_HDR)
$(ALL_GUI_HEADERS)
</set>
<set var="ALL_HEADERS" make_var="1" hints="files">
$(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
<!-- used by 'make dist', should include wxBase headers for all ports -->
<set var="ALL_BASE_HEADERS" make_var="1" hints="files">
$(BASE_CMN_HDR)
$(BASE_UNIX_HDR)
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
$(BASE_MACOSX_HDR)
$(BASE_PALMOS_HDR)
$(BASE_MSDOS_HDR)
$(NET_CMN_HDR)
$(NET_UNIX_HDR)
$(NET_WIN32_HDR) $(NET_WINCE_HDR)
$(NET_OS2_HDR)
$(NET_UNIX_HDR)
$(NET_MAC_CARBONLIB_HDR)
$(XML_HDR) $(ODBC_HDR)
</set>
<!-- used by 'make dist', should include wxBase sources for all ports -->
<set var="ALL_BASE_SOURCES" make_var="1" hints="files">
$(BASE_CMN_SRC)
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)

7
build/bakefiles/make_dist.mk
View File

@ -25,6 +25,7 @@ X11DIR = $(WXDIR)/src/x11
X11INC = $(WXDIR)/include/wx/x11
MGLDIR = $(WXDIR)/src/mgl
MOTIFDIR = $(WXDIR)/src/motif
MSDOSDIR = $(WXDIR)/src/msdos
MSWDIR = $(WXDIR)/src/msw
PMDIR = $(WXDIR)/src/os2
MACDIR = $(WXDIR)/src/mac
@ -205,9 +206,11 @@ BASE_DIST: ALL_DIST
mkdir $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/include/wx/xml
mkdir $(DISTDIR)/include/wx/msdos
mkdir $(DISTDIR)/include/wx/msw
mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/src/unix
mkdir $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/src/msw
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
@ -382,8 +385,12 @@ UNIV_DIST: ALL_GUI_DIST
MGL_DIST: UNIV_DIST
cp $(WXDIR)/wxMGL.spec $(DISTDIR)
cp $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
mkdir $(DISTDIR)/include/wx/msdos
cp $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
cp $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
cp $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
mkdir $(DISTDIR)/src/msdos
cp $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/contrib
cp -R $(WXDIR)/contrib $(DISTDIR)

2
build/bakefiles/wx.bkl
View File

@ -218,7 +218,7 @@
<!-- add "make dist" target to autoconf: -->
<set var="VARS_DONT_ELIMINATE" append="1">
ALL_BASE_SOURCES WX_VERSION
ALL_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION
</set>
<fragment format="autoconf" file="make_dist.mk"/>