[gtkmm] Update gtk/src/filelist.am and gtk/gtkmm/filelist.am.

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 59662fad9121c49483b348c0641fd21e59e25bdf
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Tue Jul 2 19:43:00 2013 +0200

    Update gtk/src/filelist.am and gtk/gtkmm/filelist.am.
    
    * gtk/src/filelist.am:
    * gtk/gtkmm/filelist.am: Update the lists of deprecated files.

 ChangeLog             |    7 +++++++
 gtk/gtkmm/filelist.am |   25 +++++++++++++++++++------
 gtk/src/filelist.am   |   32 ++++++++++++++++----------------
 3 files changed, 42 insertions(+), 22 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9fd986f..9152039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2013-07-02  Kjell Ahlstedt  <kjell ahlstedt bredband net>
 
+       Update gtk/src/filelist.am and gtk/gtkmm/filelist.am.
+
+       * gtk/src/filelist.am:
+       * gtk/gtkmm/filelist.am: Update the lists of deprecated files.
+
+2013-07-02  Kjell Ahlstedt  <kjell ahlstedt bredband net>
+
        Deprecate Gtk::ActionGroup, *Action, Activatable (sort of), UIManager.
 
        * gtk/gtkmm/radiobuttongroup.[h|cc]: Deprecate the add() that takes a RadioAction.
diff --git a/gtk/gtkmm/filelist.am b/gtk/gtkmm/filelist.am
index 1a83d56..cfe106d 100644
--- a/gtk/gtkmm/filelist.am
+++ b/gtk/gtkmm/filelist.am
@@ -4,7 +4,7 @@ gtkmm_files_built_cc = $(gtkmm_files_used_hg:.hg=.cc) wrap_init.cc
 gtkmm_files_built_h  = $(gtkmm_files_used_hg:.hg=.h)
 gtkmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(gtkmm_files_used_hg))
 
-gtkmm_files_extra_cc =                 \
+gtkmm_files_extra_any_cc =             \
        accelkey.cc                     \
        accelmap.cc                     \
        cellrenderer_generation.cc      \
@@ -12,13 +12,15 @@ gtkmm_files_extra_cc =                      \
        object.cc \
        radiobuttongroup.cc             \
        selectiondata_private.cc        \
-       stock.cc                        \
-       stockid.cc                      \
        targetentry.cc                  \
        treemodelcolumn.cc              \
        treeview_private.cc
 
-gtkmm_files_extra_h =                  \
+gtkmm_files_extra_deprecated_cc = \
+       stock.cc   \
+       stockid.cc
+
+gtkmm_files_extra_any_h =                      \
        accelkey.h                      \
        accelmap.h                      \
        base.h                          \
@@ -28,12 +30,23 @@ gtkmm_files_extra_h =                       \
        object.h \
        radiobuttongroup.h              \
        selectiondata_private.h         \
-       stock.h                         \
-       stockid.h                       \
        targetentry.h                   \
        treemodelcolumn.h               \
        treeview_private.h              \
        wrap_init.h
 
+gtkmm_files_extra_deprecated_h = \
+       stock.h   \
+       stockid.h
+
 gtkmm_files_extra_ph = \
        private/object_p.h
+
+if DISABLE_DEPRECATED_API
+gtkmm_files_extra_cc = $(gtkmm_files_extra_any_cc)
+gtkmm_files_extra_h = $(gtkmm_files_extra_any_h)
+else
+gtkmm_files_extra_cc = $(gtkmm_files_extra_any_cc) $(gtkmm_files_extra_deprecated_cc)
+gtkmm_files_extra_h = $(gtkmm_files_extra_any_h) $(gtkmm_files_extra_deprecated_h)
+endif
+
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 69ab1e9..3d8d8c2 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -15,9 +15,7 @@ gtkmm_files_any_hg =          \
        aboutdialog.hg          \
        accelgroup.hg           \
        accellabel.hg           \
-       action.hg               \
        actionable.hg           \
-       actiongroup.hg          \
        activatable.hg          \
        adjustment.hg           \
        alignment.hg            \
@@ -59,7 +57,6 @@ gtkmm_files_any_hg =          \
        colorbutton.hg          \
        colorchooser.hg         \
        colorchooserdialog.hg   \
-       colorselection.hg       \
        combobox.hg             \
        comboboxtext.hg         \
        container.hg            \
@@ -85,15 +82,11 @@ gtkmm_files_any_hg =                \
        fontchooserwidget.hg    \
        frame.hg                \
        grid.hg                 \
-       handlebox.hg            \
-       iconfactory.hg          \
+       hvbox.hg                \
        iconinfo.hg             \
-       iconset.hg              \
-       iconsource.hg           \
        icontheme.hg            \
        iconview.hg             \
        image.hg                \
-       imagemenuitem.hg        \
        infobar.hg              \
        invisible.hg            \
        label.hg                \
@@ -122,12 +115,10 @@ gtkmm_files_any_hg =              \
        printoperationpreview.hg\
        printsettings.hg        \
        progressbar.hg          \
-       radioaction.hg          \
        radiobutton.hg          \
        radiomenuitem.hg        \
        radiotoolbutton.hg      \
        range.hg                \
-       recentaction.hg         \
        recentchooser.hg        \
        recentchooserdialog.hg  \
        recentchoosermenu.hg    \
@@ -152,13 +143,11 @@ gtkmm_files_any_hg =              \
        spinner.hg              \
        statusbar.hg            \
        statusicon.hg           \
-       stockitem.hg            \
        stylecontext.hg         \
        styleprovider.hg        \
        switch.hg               \
        table.hg                \
        targetlist.hg           \
-       tearoffmenuitem.hg      \
        textattributes.hg       \
        textbuffer.hg           \
        textchildanchor.hg      \
@@ -167,7 +156,6 @@ gtkmm_files_any_hg =                \
        texttag.hg              \
        texttagtable.hg         \
        textview.hg             \
-       toggleaction.hg         \
        togglebutton.hg         \
        toggletoolbutton.hg     \
        toolbar.hg              \
@@ -190,7 +178,6 @@ gtkmm_files_any_hg =                \
        treestore.hg            \
        treeview.hg             \
        treeviewcolumn.hg       \
-       uimanager.hg            \
        viewport.hg             \
        volumebutton.hg         \
        widget.hg               \
@@ -208,13 +195,26 @@ gtkmm_files_x11_hg =            \
        socket.hg
 
 gtkmm_files_deprecated_hg =    \
+       action.hg               \
+       actiongroup.hg          \
+       colorselection.hg       \
        fontselection.hg        \
-       hvbox.hg                \
+       handlebox.hg            \
        hvbuttonbox.hg          \
        hvpaned.hg              \
        hvscale.hg              \
        hvscrollbar.hg          \
-       hvseparator.hg
+       hvseparator.hg    \
+       iconfactory.hg          \
+       iconset.hg              \
+       iconsource.hg           \
+       imagemenuitem.hg        \
+       radioaction.hg          \
+       recentaction.hg         \
+       stockitem.hg            \
+       tearoffmenuitem.hg      \
+       toggleaction.hg         \
+       uimanager.hg
 
 if HOST_WINDOWS_NATIVE
 gtkmm_files_arch_hg =