diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2015-12-05 11:51:36 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2015-12-05 11:51:36 +0100 |
| commit | c3101a0bc7c5d0d2cca7c2c7e6f7e6d4882f5cd1 (patch) | |
| tree | ec43315a802da7bdcfb0aa443aac5d944d2620cd /glib/src/filelist.am | |
| parent | 1b5cab8581c9c412ea2cf3f5f7b5de0add9d870d (diff) | |
| download | glibmm-c3101a0bc7c5d0d2cca7c2c7e6f7e6d4882f5cd1.tar.gz | |
Fix the build with --disable-deprecated-api
* examples/thread/threadpool.cc: If --disable-deprecated-api, just print a
message and exit.
* gio/src/<several>.hg: Add _CONFIGINCLUDE(giommconfig.h).
* gio/src/menuitem.ccg: Add a missing _DEPRECATE_IFDEF_START/_END pair.
* glib/glibmm/sarray.h:
* glib/glibmm/threadpool.[cc|h]: #include <glibmmconfig.h> before
ifndef GLIBMM_DISABLE_DEPRECATED.
* glib/src/filelist.am: Remove glibmm_files_deprecated_hg. List deprecated
files in glibmm_files_any_hg.
The config file must be included before #ifndef xxx_DISABLE_DEPRECATED both
in the .h file and in the .cc file, or else deprecated API is not properly
disabled by --disable-deprecated-api.
Diffstat (limited to 'glib/src/filelist.am')
| -rw-r--r-- | glib/src/filelist.am | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/glib/src/filelist.am b/glib/src/filelist.am index 94341328..a35ffdc1 100644 --- a/glib/src/filelist.am +++ b/glib/src/filelist.am @@ -35,26 +35,24 @@ glibmm_files_any_hg = \ regex.hg \ shell.hg \ spawn.hg \ + thread.hg \ threads.hg \ timezone.hg \ unicode.hg \ uriutils.hg \ + valuearray.hg \ variant.hg \ variantdict.hg \ variantiter.hg \ varianttype.hg -glibmm_files_deprecated_hg = \ - thread.hg \ - valuearray.hg - -if DISABLE_DEPRECATED_API +## Unconditionally used files, +## deprecated files (even if configured with --disable-deprecated-api), +## if there are architecture-specific files, only those for the present architecture. glibmm_files_used_hg = $(glibmm_files_any_hg) -else -glibmm_files_used_hg = $(glibmm_files_any_hg) $(glibmm_files_deprecated_hg) -endif -glibmm_files_hg = $(glibmm_files_any_hg) $(glibmm_files_deprecated_hg) +## All .hg files +glibmm_files_hg = $(glibmm_files_any_hg) glibmm_files_ccg = $(glibmm_files_hg:.hg=.ccg) |