[vte] build: Add deprecation infrastructure back in

[Christian Persch <chpe src gnome org>]

commit ca4458536e6068e3302902961f36b0d2d409b5b2
Author: Christian Persch <chpe gnome org>
Date:   Mon Nov 3 18:38:29 2014 +0100

    build: Add deprecation infrastructure back in
    
    This reverts commit 8b7ecc9d646a58d86b38c7b0f943778f766a2995.
    
    Conflicts:
        src/Makefile.am
        src/vte.h

 src/Makefile.am     |    7 +++++--
 src/vte.h           |    4 ++++
 src/vtedeprecated.h |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index f7082d8..bf50886 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST =
 headerdir = $(includedir)/vte-$(VTE_API_VERSION)/vte
 header_HEADERS = \
        vte.h \
+       vtedeprecated.h \
        vteenums.h \
        vteglobals.h \
        vtemacros.h \
@@ -69,6 +70,7 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        vteconv.h \
        vtedraw.c \
        vtedraw.h \
+       vtedeprecated.h \
        vteenums.h \
        vteglobals.h \
        vteint.h \
@@ -144,13 +146,13 @@ marshal.h: marshal.list
 
 vtetypebuiltins.h: stamp-vtetypebuiltins.h
        @true
-stamp-vtetypebuiltins.h: vtetypebuiltins.h.template vteenums.h
+stamp-vtetypebuiltins.h: vtetypebuiltins.h.template vteenums.h vtedeprecated.h
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter %.h,$^) > xgen-vtbh \
        && (cmp -s xgen-vtbh vtetypebuiltins.h || cp xgen-vtbh vtetypebuiltins.h ) \
        && rm -f xgen-vtbh \
        && echo timestamp > $(@F)
 
-vtetypebuiltins.c: vtetypebuiltins.c.template vteenums.h
+vtetypebuiltins.c: vtetypebuiltins.c.template vteenums.h vtedeprecated.h
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter %.h,$^) > xgen-vtbc \
        && (cmp -s xgen-vtbc vtetypebuiltins.c || cp xgen-vtbc vtetypebuiltins.c ) \
        && rm -f xgen-vtbc
@@ -185,6 +187,7 @@ Vte_ VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h"
 Vte_ VTE_API_VERSION_U@_gir_FILES = \
        vte.c \
        vte.h \
+       vtedeprecated.h \
        vteenums.h \
        vteglobals.h \
        vtemacros.h \
diff --git a/src/vte.h b/src/vte.h
index 8543ebe..6da222d 100644
--- a/src/vte.h
+++ b/src/vte.h
@@ -30,6 +30,10 @@
 #include "vtetypebuiltins.h"
 #include "vteversion.h"
 
+#ifndef VTE_DISABLE_DEPRECATED
+#include "vtedeprecated.h"
+#endif /* VTE_DISABLE_DEPRECATED */
+
 #undef __VTE_VTE_H_INSIDE__
 
 #endif /* __VTE_VTE_H__ */
diff --git a/src/vtedeprecated.h b/src/vtedeprecated.h
new file mode 100644
index 0000000..c5fdfd6
--- /dev/null
+++ b/src/vtedeprecated.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2001,2002,2003,2009,2010 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
+#error "Only <vte/vte.h> can be included directly."
+#endif
+
+#ifndef __VTE_DEPRECATED_H__
+#define __VTE_DEPRECATED_H__
+
+#ifndef VTE_DISABLE_DEPRECATION_WARNINGS
+#define _VTE_DEPRECATED G_DEPRECATED
+#else
+#define _VTE_DEPRECATED
+#endif
+
+G_BEGIN_DECLS
+
+G_END_DECLS
+
+#undef _VTE_DEPRECATED
+
+#endif /* !__VTE_DEPRECATED__H__ */