[cogl/cogl-latest-win: 5/9] cogl-pango: Split out source listings




commit e7ba23e2ab1af5d74d275d93c0d458f94804f599
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Oct 18 17:20:08 2021 +0800

    cogl-pango: Split out source listings
    
    This is so that other non-autotools build systems can share the source
    listings.

 cogl-pango/Makefile.am         | 31 ++++++++-----------------------
 cogl-pango/cogl-pango-srcs.mak | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am
index 377feeef..d9e55130 100644
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -7,26 +7,11 @@ DISTCLEANFILES =
 
 EXTRA_DIST =
 
-source_c = \
-       cogl-pango-display-list.c   \
-       cogl-pango-fontmap.c        \
-       cogl-pango-render.c         \
-       cogl-pango-glyph-cache.c    \
-       cogl-pango-pipeline-cache.c \
-       $(NULL)
-
-source_h = cogl-pango.h
-
-source_h_priv = \
-       cogl-pango-display-list.h   \
-       cogl-pango-private.h        \
-       cogl-pango-glyph-cache.h    \
-       cogl-pango-pipeline-cache.h \
-       $(NULL)
+include cogl-pango-srcs.mak
 
 lib_LTLIBRARIES = libcogl-pango.la
 
-libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
+libcogl_pango_la_SOURCES = $(source_pango_c) $(source_pango_h) $(source_pango_h_priv)
 libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) 
$(MAINTAINER_CFLAGS)
 libcogl_pango_la_LIBADD = $(top_builddir)/cogl/libcogl.la
 libcogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
@@ -46,7 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_builddir)
 
 cogl_pangoheadersdir = $(includedir)/cogl/cogl-pango
-cogl_pangoheaders_HEADERS = $(source_h)
+cogl_pangoheaders_HEADERS = $(source_pango_h)
 
 pc_files = cogl-pango-1.0.pc \
           cogl-pango-$(COGL_API_VERSION)-experimental.pc
@@ -60,7 +45,7 @@ DISTCLEANFILES += $(pc_files)
 dist-hook: ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj 
../build/win32/vs10/cogl-pango.vcxproj.filters
 
 ../build/win32/vs9/cogl-pango.vcproj: $(top_srcdir)/build/win32/vs9/cogl-pango.vcprojin
-       for F in $(source_c); do \
+       for F in $(source_pango_c); do \
                case $$F in \
                *.c)    echo '   <File RelativePath="..\..\..\cogl-pango\'$$F'" />' \
                        ;; \
@@ -70,7 +55,7 @@ dist-hook: ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.v
        rm coglpango.sourcefiles
        
 ../build/win32/vs10/cogl-pango.vcxproj: $(top_srcdir)/build/win32/vs10/cogl-pango.vcxprojin
-       for F in $(source_c); do \
+       for F in $(source_pango_c); do \
                case $$F in \
                *.c)    echo '    <ClCompile Include="..\..\..\cogl-pango\'$$F'" />' \
                        ;; \
@@ -80,7 +65,7 @@ dist-hook: ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.v
        rm coglpango.vs10.sourcefiles
        
 ../build/win32/vs10/cogl-pango.vcxproj.filters: $(top_srcdir)/build/win32/vs10/cogl-pango.vcxproj.filtersin
-       for F in $(source_c); do \
+       for F in $(source_pango_c); do \
                case $$F in \
                *.c)    echo '    <ClCompile 
Include="..\..\..\cogl-pango\'$$F'"><Filter>Sources</Filter></ClCompile>' \
                        ;; \
@@ -105,7 +90,7 @@ CoglPango-1.0.gir: libcogl-pango.la Makefile
 CoglPango_1_0_gir_NAMESPACE = CoglPango
 CoglPango_1_0_gir_VERSION = 1.0
 CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libcogl.la libcogl-pango.la
-CoglPango_1_0_gir_FILES = $(source_h) $(source_c)
+CoglPango_1_0_gir_FILES = $(source_pango_h) $(source_pango_c)
 CoglPango_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
 CoglPango_1_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
 CoglPango_1_0_gir_EXPORT_PACKAGES = cogl-pango-1.0
@@ -121,7 +106,7 @@ CoglPango-2.0.gir: libcogl-pango.la Makefile
 CoglPango_2_0_gir_NAMESPACE = CoglPango
 CoglPango_2_0_gir_VERSION = 2.0
 CoglPango_2_0_gir_LIBS = $(top_builddir)/cogl/libcogl.la libcogl-pango.la
-CoglPango_2_0_gir_FILES = $(source_h) $(source_c)
+CoglPango_2_0_gir_FILES = $(source_pango_h) $(source_pango_c)
 CoglPango_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
 CoglPango_2_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
 CoglPango_2_0_gir_EXPORT_PACKAGES = cogl-pango-2.0-experimental
diff --git a/cogl-pango/cogl-pango-srcs.mak b/cogl-pango/cogl-pango-srcs.mak
new file mode 100644
index 00000000..5064cd7c
--- /dev/null
+++ b/cogl-pango/cogl-pango-srcs.mak
@@ -0,0 +1,16 @@
+source_pango_c = \
+       cogl-pango-display-list.c   \
+       cogl-pango-fontmap.c        \
+       cogl-pango-render.c         \
+       cogl-pango-glyph-cache.c    \
+       cogl-pango-pipeline-cache.c \
+       $(NULL)
+
+source_pango_h = cogl-pango.h
+
+source_pango_h_priv = \
+       cogl-pango-display-list.h   \
+       cogl-pango-private.h        \
+       cogl-pango-glyph-cache.h    \
+       cogl-pango-pipeline-cache.h \
+       $(NULL)
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]