2003-07-06 22:19:27 +00:00
|
|
|
# =========================================================================
|
|
|
|
|
# This makefile was generated by
|
2008-10-27 16:40:51 +00:00
|
|
|
# Bakefile 0.2.5 (http://www.bakefile.org)
|
2003-07-06 22:19:27 +00:00
|
|
|
# Do not modify, all changes will be overwritten!
|
|
|
|
|
# =========================================================================
|
Applied [ 594925 ] Implement wxArtProvider and XRC together
By Robert O'Connor (robertoconnor)
This patch is a draft which successfully allows a wxArtProvider to serve out icons to bitmaps for XRC files.
The syntax to use a wxArtProvider bitmap is:
<bitmap stock_id="wxART_INFORMATION" stock_client="wxART_TOOLBAR">somefallbackicon.png</bitmap>
The bitmap is optional, and will only be used as a fallback image, if the wxArtProvider returned a wxNullBitmap for some reason.
The client attribute, if not specified, currently will be wxART_OTHER. Perhaps there should be a guessing heuristic of it being in a menu node to call wxART_MENU.
Usage of XRC resouces and wxArtProvider together can be seen in an updated /contrib/samples/xrc demo, which is a separate patch.
Search the wx-dev mailing lists for "wxArtProvider" and "XRC" for the full discussions on this feature's API design.
Applied patch [ 594932 ] Extended XRC XML resources sample
By Robert O'Connor (robertoconnor)
This is a more comprehensive introduction to how to get up and running using XRC in your new wxWindows project.
It describes both the basics (for new users) and advanced features. It consists of a demo of dialogs and frames loaded from XRC. Each dialog has a textctrl at the top of the dialog, which walks the new user through that feature.
There are 8 demos:
The 4 basic ones:
-A non-derived dialog, as typically used for an about dialog.
-A derived dialog that loads its resources from an XRC (a frequently-asked question on the mailing lists), and responds to some simple events, including the disable-another-control-via-EVT_UPDATE_UI that is another FAQ, and powerful and simple-to-use feature.
-A XRC reference "Controls" dialog, using a notebook. Each tab has a single control. All XRC handled widgets can be seen at a glance, and how to use them under XRC.
-An uncentered dialog, to demonstrate the easy use of <centered>1</centered> to automatically place a Dialog centered on its parent..
The 4 advanced ones:
-Embedding a custom class into an XRC dialog, by using the "unknown" class.
-Using wxArtProvider to use stock icons from within your your XRC resources.
-Using the platform attribute to selectively show a part of XRC based on the current OS.
-Runtime variable expansion (demo only. Not implemented at this time).
Also:
-The main frame is now demonstrated as being loaded as an XRC.
- The toolbar has longhelp tag demonstrated, and are hooked up to the same events as the menu to show how XRCID() works on the same tool and menuitem XRCID.
-Some custom icons for the demonstration were created, and put into the toolbar and menubar. A custom icon also for the demonstration.
-The example code has been put in 1 class per file (both .cpp and a matching .xrc), to make it much less confusing for a newcomer to figure out what class is what, expecially with all the wx macros for declaration and implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-16 11:24:46 +00:00
|
|
|
|
|
|
|
|
|
2003-07-06 22:19:27 +00:00
|
|
|
@MAKE_SET@
|
|
|
|
|
|
|
|
|
|
prefix = @prefix@
|
|
|
|
|
exec_prefix = @exec_prefix@
|
2008-01-23 12:13:07 +00:00
|
|
|
datarootdir = @datarootdir@
|
2003-07-06 22:19:27 +00:00
|
|
|
INSTALL = @INSTALL@
|
2004-01-22 03:48:09 +00:00
|
|
|
EXEEXT = @EXEEXT@
|
2005-11-25 05:17:36 +00:00
|
|
|
WINDRES = @WINDRES@
|
2004-01-22 03:48:09 +00:00
|
|
|
SETFILE = @SETFILE@
|
|
|
|
|
NM = @NM@
|
2006-11-04 20:39:49 +00:00
|
|
|
BK_DEPS = @BK_DEPS@
|
2004-01-22 03:48:09 +00:00
|
|
|
srcdir = @srcdir@
|
|
|
|
|
top_srcdir = @top_srcdir@
|
2006-11-04 20:39:49 +00:00
|
|
|
LIBS = @LIBS@
|
2004-01-22 03:48:09 +00:00
|
|
|
LDFLAGS_GUI = @LDFLAGS_GUI@
|
2003-07-06 22:19:27 +00:00
|
|
|
CXX = @CXX@
|
|
|
|
|
CXXFLAGS = @CXXFLAGS@
|
2004-01-22 03:48:09 +00:00
|
|
|
CPPFLAGS = @CPPFLAGS@
|
|
|
|
|
LDFLAGS = @LDFLAGS@
|
2004-09-22 15:08:33 +00:00
|
|
|
WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
|
2004-01-22 03:48:09 +00:00
|
|
|
TOOLKIT = @TOOLKIT@
|
|
|
|
|
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
|
|
|
|
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
2005-11-25 05:17:36 +00:00
|
|
|
TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
|
2003-07-06 22:19:27 +00:00
|
|
|
EXTRALIBS = @EXTRALIBS@
|
2003-09-12 21:49:46 +00:00
|
|
|
EXTRALIBS_XML = @EXTRALIBS_XML@
|
2004-01-22 03:48:09 +00:00
|
|
|
EXTRALIBS_HTML = @EXTRALIBS_HTML@
|
|
|
|
|
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
2004-02-05 22:34:18 +00:00
|
|
|
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
2007-10-11 15:58:04 +00:00
|
|
|
CXXWARNINGS = @CXXWARNINGS@
|
2003-07-20 00:06:37 +00:00
|
|
|
HOST_SUFFIX = @HOST_SUFFIX@
|
2003-07-06 22:19:27 +00:00
|
|
|
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
2003-08-13 12:38:44 +00:00
|
|
|
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
2006-11-04 20:39:49 +00:00
|
|
|
wx_top_builddir = @wx_top_builddir@
|
2003-07-06 22:19:27 +00:00
|
|
|
|
|
|
|
|
### Variables: ###
|
|
|
|
|
|
2003-10-04 13:49:34 +00:00
|
|
|
DESTDIR =
|
2007-02-07 02:14:45 +00:00
|
|
|
WX_RELEASE = 2.9
|
2006-11-10 02:32:01 +00:00
|
|
|
WX_VERSION = $(WX_RELEASE).0
|
2006-11-04 20:39:49 +00:00
|
|
|
LIBDIRNAME = $(wx_top_builddir)/lib
|
2005-03-23 13:05:13 +00:00
|
|
|
XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
|
|
|
|
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
2007-10-11 15:58:04 +00:00
|
|
|
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
|
|
|
|
|
$(CPPFLAGS) $(CXXFLAGS)
|
2003-08-01 16:05:28 +00:00
|
|
|
XRCDEMO_OBJECTS = \
|
2003-10-04 13:49:34 +00:00
|
|
|
$(__xrcdemo_os2_lib_res) \
|
2003-08-01 16:05:28 +00:00
|
|
|
xrcdemo_xrcdemo.o \
|
|
|
|
|
xrcdemo_myframe.o \
|
|
|
|
|
xrcdemo_derivdlg.o \
|
|
|
|
|
xrcdemo_custclas.o \
|
|
|
|
|
$(__xrcdemo___win32rc)
|
2003-07-06 22:19:27 +00:00
|
|
|
|
|
|
|
|
### Conditionally set variables: ###
|
|
|
|
|
|
2003-08-23 11:38:02 +00:00
|
|
|
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
2006-11-04 20:39:49 +00:00
|
|
|
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
|
2005-02-19 03:56:12 +00:00
|
|
|
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
|
2003-07-06 22:19:27 +00:00
|
|
|
@COND_USE_GUI_0@PORTNAME = base
|
|
|
|
|
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
|
|
|
|
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
2008-10-08 15:44:49 +00:00
|
|
|
@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
|
2003-08-01 16:05:28 +00:00
|
|
|
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
2003-07-06 22:19:27 +00:00
|
|
|
@COND_UNICODE_1@WXUNICODEFLAG = u
|
|
|
|
|
@COND_WXUNIV_1@WXUNIVNAME = univ
|
2004-10-18 17:02:37 +00:00
|
|
|
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
|
|
|
|
|
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
|
|
|
|
|
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
|
|
|
|
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
2008-01-23 12:13:07 +00:00
|
|
|
@COND_PLATFORM_MAC_0@__xrcdemo___mac_setfilecmd = @true
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \
|
2008-09-04 07:57:32 +00:00
|
|
|
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL xrcdemo$(EXEEXT)
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
|
|
|
|
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
2005-03-23 13:05:13 +00:00
|
|
|
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
|
|
|
|
|
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
|
|
|
|
|
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
|
|
|
|
|
@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
|
|
|
|
|
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
|
|
|
|
|
@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
|
2003-07-06 22:19:27 +00:00
|
|
|
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
2003-07-20 00:06:37 +00:00
|
|
|
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
|
2004-01-22 03:48:09 +00:00
|
|
|
COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \
|
|
|
|
|
grep -q pmwin.763 ; then emxbind -ep xrcdemo$(EXEEXT) ; fi
|
|
|
|
|
@COND_PLATFORM_OS2_1@__xrcdemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd)
|
2005-11-25 05:17:36 +00:00
|
|
|
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
|
|
|
|
|
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_PLATFORM_OS2_1@__xrcdemo_os2_lib_res = \
|
|
|
|
|
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
2008-06-02 14:48:50 +00:00
|
|
|
@COND_PLATFORM_MACOSX_1@__xrcdemo_app_Contents_PkgInfo___depname \
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@ = xrcdemo.app/Contents/PkgInfo
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle
|
2008-09-20 23:59:10 +00:00
|
|
|
@COND_TOOLKIT_MAC@____xrcdemo_BUNDLE_TGT_REF_DEP = \
|
|
|
|
|
@COND_TOOLKIT_MAC@ $(__xrcdemo_app_Contents_PkgInfo___depname)
|
2008-09-11 12:30:18 +00:00
|
|
|
@COND_TOOLKIT_OSX_CARBON@____xrcdemo_BUNDLE_TGT_REF_DEP \
|
|
|
|
|
@COND_TOOLKIT_OSX_CARBON@ = $(__xrcdemo_app_Contents_PkgInfo___depname)
|
|
|
|
|
@COND_TOOLKIT_OSX_COCOA@____xrcdemo_BUNDLE_TGT_REF_DEP \
|
|
|
|
|
@COND_TOOLKIT_OSX_COCOA@ = $(__xrcdemo_app_Contents_PkgInfo___depname)
|
|
|
|
|
@COND_TOOLKIT_OSX_IPHONE@____xrcdemo_BUNDLE_TGT_REF_DEP \
|
|
|
|
|
@COND_TOOLKIT_OSX_IPHONE@ = $(__xrcdemo_app_Contents_PkgInfo___depname)
|
2004-05-24 14:12:40 +00:00
|
|
|
@COND_TOOLKIT_COCOA@____xrcdemo_BUNDLE_TGT_REF_DEP = \
|
2008-06-02 14:48:50 +00:00
|
|
|
@COND_TOOLKIT_COCOA@ $(__xrcdemo_app_Contents_PkgInfo___depname)
|
wx-config2.6
Designed to be resiliant against future cut and paste coders. Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble. In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs. Functions now all have api
descriptions. If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.
Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer. Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future. In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied. If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested. At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.
Removed references to --gl-libs in --help. It still exists, but if
its deprecated, no need to fill space in a compact help summary. It
will remain documented (as deprecated) in the man page.
Removed references to arcane order rules for arguments. Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.
Removed references to --inplace, it doesn't need to be in the summary
help either. It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly. When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case). If you do type it when you don't need it, bad things will
probably happen just like they always would have.
Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging. If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.
Command line input is now controlled by a small generic parser. You
define what options you want and what groups you want them in by
initialising them as lists. It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.
Added a validator for it to check yes/no options.
Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.
Made --list more user friendly. It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix. Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called. We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.
Delegation. Too big a topic to remark on in depth here, see the code
for a fuller description. With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified. This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.
Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.
Added the inplace-config tweak for use in the build tree. This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed. It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with. In that event, it will try to delegate as per the
normal rules.
The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs. It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)
Enabled full support for static builds again, promoted --static to a
full feature option. Fixed --ld to return something for them too.
Added --flavour, similar to the existing --vendor, but for autoconf
builds. These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.
Fix bit rot in make-dist due to new/deleted files.
Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution. Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about. Remove extra files and symlinks added for the two
part wx-config version.
Removed the debian -contrib packages. We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required. This means the retained contribs will
now get __WXDEBUG__ versions packaged too.
Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.
Added support for flavoured debs as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
|
|
|
COND_MONOLITHIC_0___WXLIB_XRC_p = \
|
2004-09-26 08:46:55 +00:00
|
|
|
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
|
wx-config2.6
Designed to be resiliant against future cut and paste coders. Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble. In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs. Functions now all have api
descriptions. If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.
Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer. Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future. In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied. If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested. At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.
Removed references to --gl-libs in --help. It still exists, but if
its deprecated, no need to fill space in a compact help summary. It
will remain documented (as deprecated) in the man page.
Removed references to arcane order rules for arguments. Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.
Removed references to --inplace, it doesn't need to be in the summary
help either. It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly. When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case). If you do type it when you don't need it, bad things will
probably happen just like they always would have.
Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging. If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.
Command line input is now controlled by a small generic parser. You
define what options you want and what groups you want them in by
initialising them as lists. It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.
Added a validator for it to check yes/no options.
Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.
Made --list more user friendly. It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix. Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called. We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.
Delegation. Too big a topic to remark on in depth here, see the code
for a fuller description. With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified. This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.
Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.
Added the inplace-config tweak for use in the build tree. This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed. It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with. In that event, it will try to delegate as per the
normal rules.
The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs. It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)
Enabled full support for static builds again, promoted --static to a
full feature option. Fixed --ld to return something for them too.
Added --flavour, similar to the existing --vendor, but for autoconf
builds. These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.
Fix bit rot in make-dist due to new/deleted files.
Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution. Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about. Remove extra files and symlinks added for the two
part wx-config version.
Removed the debian -contrib packages. We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required. This means the retained contribs will
now get __WXDEBUG__ versions packaged too.
Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.
Added support for flavoured debs as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
|
|
|
@COND_MONOLITHIC_0@__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
|
2004-01-22 03:48:09 +00:00
|
|
|
COND_MONOLITHIC_0___WXLIB_HTML_p = \
|
2004-09-26 08:46:55 +00:00
|
|
|
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
|
|
|
|
|
COND_MONOLITHIC_0___WXLIB_ADV_p = \
|
2004-09-26 08:46:55 +00:00
|
|
|
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
|
|
|
|
|
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
2004-09-26 08:46:55 +00:00
|
|
|
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
wx-config2.6
Designed to be resiliant against future cut and paste coders. Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble. In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs. Functions now all have api
descriptions. If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.
Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer. Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future. In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied. If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested. At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.
Removed references to --gl-libs in --help. It still exists, but if
its deprecated, no need to fill space in a compact help summary. It
will remain documented (as deprecated) in the man page.
Removed references to arcane order rules for arguments. Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.
Removed references to --inplace, it doesn't need to be in the summary
help either. It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly. When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case). If you do type it when you don't need it, bad things will
probably happen just like they always would have.
Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging. If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.
Command line input is now controlled by a small generic parser. You
define what options you want and what groups you want them in by
initialising them as lists. It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.
Added a validator for it to check yes/no options.
Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.
Made --list more user friendly. It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix. Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called. We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.
Delegation. Too big a topic to remark on in depth here, see the code
for a fuller description. With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified. This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.
Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.
Added the inplace-config tweak for use in the build tree. This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed. It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with. In that event, it will try to delegate as per the
normal rules.
The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs. It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)
Enabled full support for static builds again, promoted --static to a
full feature option. Fixed --ld to return something for them too.
Added --flavour, similar to the existing --vendor, but for autoconf
builds. These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.
Fix bit rot in make-dist due to new/deleted files.
Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution. Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about. Remove extra files and symlinks added for the two
part wx-config version.
Removed the debian -contrib packages. We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required. This means the retained contribs will
now get __WXDEBUG__ versions packaged too.
Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.
Added support for flavoured debs as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
|
|
|
COND_MONOLITHIC_0___WXLIB_XML_p = \
|
2004-09-26 08:46:55 +00:00
|
|
|
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
|
wx-config2.6
Designed to be resiliant against future cut and paste coders. Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble. In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs. Functions now all have api
descriptions. If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.
Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer. Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future. In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied. If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested. At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.
Removed references to --gl-libs in --help. It still exists, but if
its deprecated, no need to fill space in a compact help summary. It
will remain documented (as deprecated) in the man page.
Removed references to arcane order rules for arguments. Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.
Removed references to --inplace, it doesn't need to be in the summary
help either. It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly. When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case). If you do type it when you don't need it, bad things will
probably happen just like they always would have.
Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging. If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.
Command line input is now controlled by a small generic parser. You
define what options you want and what groups you want them in by
initialising them as lists. It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.
Added a validator for it to check yes/no options.
Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.
Made --list more user friendly. It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix. Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called. We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.
Delegation. Too big a topic to remark on in depth here, see the code
for a fuller description. With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified. This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.
Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.
Added the inplace-config tweak for use in the build tree. This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed. It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with. In that event, it will try to delegate as per the
normal rules.
The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs. It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)
Enabled full support for static builds again, promoted --static to a
full feature option. Fixed --ld to return something for them too.
Added --flavour, similar to the existing --vendor, but for autoconf
builds. These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.
Fix bit rot in make-dist due to new/deleted files.
Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution. Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about. Remove extra files and symlinks added for the two
part wx-config version.
Removed the debian -contrib packages. We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required. This means the retained contribs will
now get __WXDEBUG__ versions packaged too.
Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.
Added support for flavoured debs as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
|
|
|
@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
|
|
|
|
|
COND_MONOLITHIC_0___WXLIB_BASE_p = \
|
2004-09-26 08:46:55 +00:00
|
|
|
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
wx-config2.6
Designed to be resiliant against future cut and paste coders. Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble. In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs. Functions now all have api
descriptions. If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.
Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer. Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future. In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied. If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested. At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.
Removed references to --gl-libs in --help. It still exists, but if
its deprecated, no need to fill space in a compact help summary. It
will remain documented (as deprecated) in the man page.
Removed references to arcane order rules for arguments. Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.
Removed references to --inplace, it doesn't need to be in the summary
help either. It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly. When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case). If you do type it when you don't need it, bad things will
probably happen just like they always would have.
Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging. If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.
Command line input is now controlled by a small generic parser. You
define what options you want and what groups you want them in by
initialising them as lists. It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.
Added a validator for it to check yes/no options.
Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.
Made --list more user friendly. It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix. Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called. We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.
Delegation. Too big a topic to remark on in depth here, see the code
for a fuller description. With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified. This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.
Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.
Added the inplace-config tweak for use in the build tree. This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed. It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with. In that event, it will try to delegate as per the
normal rules.
The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs. It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)
Enabled full support for static builds again, promoted --static to a
full feature option. Fixed --ld to return something for them too.
Added --flavour, similar to the existing --vendor, but for autoconf
builds. These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.
Fix bit rot in make-dist due to new/deleted files.
Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution. Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about. Remove extra files and symlinks added for the two
part wx-config version.
Removed the debian -contrib packages. We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required. This means the retained contribs will
now get __WXDEBUG__ versions packaged too.
Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.
Added support for flavoured debs as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
|
|
|
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o
|
|
|
|
|
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
2004-09-26 08:46:55 +00:00
|
|
|
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
2004-01-22 03:48:09 +00:00
|
|
|
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
2008-10-08 15:44:49 +00:00
|
|
|
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
|
|
|
|
|
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
|
|
|
|
|
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
|
|
|
@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
|
|
|
|
|
@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
|
|
|
|
|
@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
|
|
|
@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
|
|
|
|
|
@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
|
|
|
|
|
@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
|
|
|
@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
|
|
|
|
|
@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
|
|
|
COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
|
wx-config2.6
Designed to be resiliant against future cut and paste coders. Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble. In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs. Functions now all have api
descriptions. If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.
Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer. Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future. In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied. If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested. At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.
Removed references to --gl-libs in --help. It still exists, but if
its deprecated, no need to fill space in a compact help summary. It
will remain documented (as deprecated) in the man page.
Removed references to arcane order rules for arguments. Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.
Removed references to --inplace, it doesn't need to be in the summary
help either. It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly. When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case). If you do type it when you don't need it, bad things will
probably happen just like they always would have.
Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging. If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.
Command line input is now controlled by a small generic parser. You
define what options you want and what groups you want them in by
initialising them as lists. It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.
Added a validator for it to check yes/no options.
Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.
Made --list more user friendly. It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix. Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called. We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.
Delegation. Too big a topic to remark on in depth here, see the code
for a fuller description. With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified. This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.
Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.
Added the inplace-config tweak for use in the build tree. This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed. It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with. In that event, it will try to delegate as per the
normal rules.
The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs. It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)
Enabled full support for static builds again, promoted --static to a
full feature option. Fixed --ld to return something for them too.
Added --flavour, similar to the existing --vendor, but for autoconf
builds. These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.
Fix bit rot in make-dist due to new/deleted files.
Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution. Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about. Remove extra files and symlinks added for the two
part wx-config version.
Removed the debian -contrib packages. We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required. This means the retained contribs will
now get __WXDEBUG__ versions packaged too.
Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.
Added support for flavoured debs as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
|
|
|
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
2008-10-08 15:44:49 +00:00
|
|
|
@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
|
|
|
|
|
@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
|
|
|
|
|
@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
2003-07-06 22:19:27 +00:00
|
|
|
|
|
|
|
|
### Targets: ###
|
|
|
|
|
|
2003-08-23 11:38:02 +00:00
|
|
|
all: xrcdemo$(EXEEXT) $(__xrcdemo_bundle___depname) data
|
2003-07-06 22:19:27 +00:00
|
|
|
|
2008-10-08 15:44:49 +00:00
|
|
|
install:
|
2004-01-22 03:48:09 +00:00
|
|
|
|
|
|
|
|
uninstall:
|
|
|
|
|
|
|
|
|
|
install-strip: install
|
|
|
|
|
|
2003-07-06 22:19:27 +00:00
|
|
|
clean:
|
2003-08-13 12:38:44 +00:00
|
|
|
rm -rf ./.deps ./.pch
|
2003-08-01 16:05:28 +00:00
|
|
|
rm -f ./*.o
|
2003-08-23 11:38:02 +00:00
|
|
|
rm -f xrcdemo$(EXEEXT)
|
2003-08-13 12:38:44 +00:00
|
|
|
rm -rf xrcdemo.app
|
2003-07-06 22:19:27 +00:00
|
|
|
|
|
|
|
|
distclean: clean
|
2005-02-12 18:53:20 +00:00
|
|
|
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
2003-07-06 22:19:27 +00:00
|
|
|
|
2003-08-23 11:38:02 +00:00
|
|
|
xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
|
2008-10-08 15:44:49 +00:00
|
|
|
$(CXX) -o $@ $(XRCDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
2008-09-04 07:57:32 +00:00
|
|
|
|
2003-07-06 22:19:27 +00:00
|
|
|
$(__xrcdemo___mac_setfilecmd)
|
2003-09-15 15:36:27 +00:00
|
|
|
$(__xrcdemo___os2_emxbindcmd)
|
2003-08-13 12:38:44 +00:00
|
|
|
$(SAMPLES_RPATH_POSTLINK)
|
|
|
|
|
|
2008-06-12 18:15:36 +00:00
|
|
|
@COND_PLATFORM_MACOSX_1@xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
2008-06-02 14:48:50 +00:00
|
|
|
@COND_PLATFORM_MACOSX_1@ mkdir -p xrcdemo.app/Contents
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@ mkdir -p xrcdemo.app/Contents/MacOS
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@ mkdir -p xrcdemo.app/Contents/Resources
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/xrcdemo/" \
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \
|
2008-06-12 18:15:36 +00:00
|
|
|
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist
|
2008-06-02 14:48:50 +00:00
|
|
|
@COND_PLATFORM_MACOSX_1@
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@ ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@
|
|
|
|
|
@COND_PLATFORM_MACOSX_1@
|
2008-06-12 18:15:36 +00:00
|
|
|
@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns
|
2003-08-13 12:38:44 +00:00
|
|
|
|
2004-05-24 14:12:40 +00:00
|
|
|
@COND_PLATFORM_MACOSX_1@xrcdemo_bundle: $(____xrcdemo_BUNDLE_TGT_REF_DEP)
|
2003-07-06 22:19:27 +00:00
|
|
|
|
2004-01-22 03:48:09 +00:00
|
|
|
data:
|
|
|
|
|
@mkdir -p ./rc
|
2006-10-28 21:54:52 +00:00
|
|
|
@for f in appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm; do \
|
2005-07-28 12:48:14 +00:00
|
|
|
if test ! -f ./rc/$$f -a ! -d ./rc/$$f ; \
|
2005-02-12 18:53:20 +00:00
|
|
|
then x=yep ; \
|
|
|
|
|
else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \
|
2004-01-22 03:48:09 +00:00
|
|
|
fi; \
|
2005-02-12 18:53:20 +00:00
|
|
|
case "$$x" in ?*) \
|
|
|
|
|
cp -pRf $(srcdir)/rc/$$f ./rc ;; \
|
|
|
|
|
esac; \
|
2004-01-22 03:48:09 +00:00
|
|
|
done
|
2003-07-06 22:19:27 +00:00
|
|
|
|
2004-01-22 03:48:09 +00:00
|
|
|
xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp
|
2005-02-12 18:53:20 +00:00
|
|
|
$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/xrcdemo.cpp
|
2003-07-06 22:19:27 +00:00
|
|
|
|
|
|
|
|
xrcdemo_myframe.o: $(srcdir)/myframe.cpp
|
2005-02-12 18:53:20 +00:00
|
|
|
$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/myframe.cpp
|
2003-07-06 22:19:27 +00:00
|
|
|
|
2004-01-22 03:48:09 +00:00
|
|
|
xrcdemo_derivdlg.o: $(srcdir)/derivdlg.cpp
|
2005-02-12 18:53:20 +00:00
|
|
|
$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/derivdlg.cpp
|
2004-01-22 03:48:09 +00:00
|
|
|
|
|
|
|
|
xrcdemo_custclas.o: $(srcdir)/custclas.cpp
|
2005-02-12 18:53:20 +00:00
|
|
|
$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/custclas.cpp
|
2003-07-06 22:19:27 +00:00
|
|
|
|
2003-07-20 00:06:37 +00:00
|
|
|
xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc
|
2007-10-11 15:58:04 +00:00
|
|
|
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
|
2003-07-20 00:06:37 +00:00
|
|
|
|
2003-07-06 22:19:27 +00:00
|
|
|
|
2008-09-04 07:57:32 +00:00
|
|
|
$(srcdir)/include/wx/stc/stc.h: \
|
|
|
|
|
$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
|
|
|
|
$(srcdir)/src/stc/stc.cpp.in \
|
|
|
|
|
$(srcdir)/src/stc/stc.h.in \
|
|
|
|
|
$(srcdir)/src/stc/gen_iface.py
|
|
|
|
|
cd $(srcdir)/src/stc && ./gen_iface.py
|
|
|
|
|
monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
|
|
|
|
$(srcdir)/include/wx/stc/stc.h
|
|
|
|
|
|
2003-07-06 22:19:27 +00:00
|
|
|
# Include dependency info, if present:
|
2008-10-08 15:44:49 +00:00
|
|
|
@IF_GNU_MAKE@-include ./.deps/*.d
|
2003-07-06 22:19:27 +00:00
|
|
|
|
2004-01-22 03:48:09 +00:00
|
|
|
.PHONY: all install uninstall clean distclean xrcdemo_bundle data
|
