Update the wx-config man page.

Remove some cruft from the docs package.
Bump version in configure.
Update aclocal.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-09-29 09:07:08 +00:00
parent 1a6a834724
commit 7714864e2f
142 changed files with 1230 additions and 1348 deletions

View File

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(top_builddir)lib
LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -99,7 +99,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@@ -108,7 +108,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o life$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@ -137,7 +137,7 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
$(__life___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p life.app/Contents
mkdir -p life.app/Contents/MacOS
mkdir -p life.app/Contents/Resources
@@ -155,7 +155,7 @@ life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
ln -f life$(EXEEXT) life.app/Contents/MacOS/life
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc life.app/Contents/Resources/life.rsrc
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc life.app/Contents/Resources/life.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns life.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@life_bundle: $(____life_BUNDLE_TGT_REF_DEP)