[Cogl] [PATCH 51/53] Remove the compat cogl-pango.h

Damien Lespiau damien.lespiau at gmail.com
Tue Jan 1 06:31:27 PST 2013


From: Damien Lespiau <damien.lespiau at intel.com>

No longer needed and was just emitting an error anyway. There is a nice
little cleanup of the Makefile.am as a result.
---
 cogl/Makefile.am  |    8 +-------
 cogl/cogl-pango.h |   28 ----------------------------
 2 files changed, 1 insertions(+), 35 deletions(-)
 delete mode 100644 cogl/cogl-pango.h

diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 4372e46..530a809 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -539,14 +539,8 @@ libcogl2_la_LDFLAGS = \
 libcogl2_la_SOURCES = $(cogl_sources_c)
 nodist_libcogl2_la_SOURCES = $(BUILT_SOURCES)
 
-# Cogl installed headers
-cogl_headers = \
-	$(cogl_public_h) \
-	$(srcdir)/cogl-pango.h \
-	$(NULL)
-
 coglincludedir = $(includedir)/cogl2/cogl
-coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
+coglinclude_HEADERS = $(cogl_public_h) $(cogl_experimental_h)
 nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h
 if USE_GLIB
 nodist_coglinclude_HEADERS += cogl-enum-types.h
diff --git a/cogl/cogl-pango.h b/cogl/cogl-pango.h
deleted file mode 100644
index 3209045..0000000
--- a/cogl/cogl-pango.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Cogl
- *
- * An object oriented GL/GLES Abstraction/Utility Layer
- *
- * Copyright (C) 2011 Intel Corporation.
- *
- * 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 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, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-#ifndef __COGL_PANGO_H_COMPAT__
-#define __COGL_PANGO_H_COMPAT__
-
-#error "#include <cogl/cogl-pango.h> is unsupported; please #include <cogl-pango/cogl-pango.h>"
-
-#endif /* __COGL_PANGO_H_COMPAT__ */
-- 
1.7.7.5



More information about the Cogl mailing list