[pango/kill-modules: 12/13] Move shapers from modules/basic/ into pango/

[Behdad Esfahbod <behdad src gnome org>]

commit 2f678cfb03660878223a84e8e9f6b6659854098d
Author: Behdad Esfahbod <behdad behdad org>
Date:   Sun Jul 27 18:11:16 2014 -0400

    Move shapers from modules/basic/ into pango/
    
    Note wired up yet.  Doesn't build.

 configure.ac                                       |   13 +------
 modules/Makefile.am                                |    1 -
 modules/basic/Makefile.am                          |   36 --------------------
 pango/Makefile.am                                  |   11 ++++--
 .../pangocoretext-shape.c                          |    1 -
 modules/basic/basic-fc.c => pango/pangofc-shape.c  |    0
 .../basic-win32.c => pango/pangowin32-shape.c      |    0
 7 files changed, 9 insertions(+), 53 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ade03e1..e702653 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,24 +258,15 @@ fi
 AM_CONDITIONAL(HAVE_XFT, test "x$with_xft" = xyes && $have_xft )
 
 #
-# Checks for Win32 GDI
+# Checks for Win32
 #
 have_win32=false
-WIN32_LIBS=""
-WIN32_CFLAGS=""
 # The following doesn't work with autoconf-2.13, so we check $host instead
 # AC_CHECK_LIB(gdi32, GetTextMetricsA 8, have_win32=true, : )
 case "$host" in
   *-*-mingw*|*-*-cygwin*) have_win32=true ;;
 esac
-
-
-if test $have_win32 = true; then
-  WIN32_LIBS="-lgdi32"
-fi
-
-AC_SUBST(WIN32_LIBS)
-AM_CONDITIONAL(HAVE_WIN32, $have_win32) 
+AM_CONDITIONAL(HAVE_WIN32, $have_win32)
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
diff --git a/modules/Makefile.am b/modules/Makefile.am
index be8e285..fa58389 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -2,7 +2,6 @@
 
 SUBDIRS =              \
        arabic          \
-       basic           \
        indic           \
        thai
 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 3e22ae8..d1561e2 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -183,6 +183,7 @@ pangoft2_public_sources =   \
        pangofc-font.c          \
        pangofc-fontmap.c       \
        pangofc-decoder.c       \
+       pangofc-shape.c         \
        pangoft2.c
 
 libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
@@ -321,8 +322,8 @@ pangocairo-win32-res.o: pangocairo.rc
        $(AM_V_GEN) $(WINDRES) $< $@
 
 
-libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
-libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la 
+libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la -lgdi32
+libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la
 
 libpangocairo_1_0_la_SOURCES += pangocairo-win32font.c pangocairo-win32fontmap.c pangocairo-win32.h
 endif
@@ -347,6 +348,7 @@ libpangocairo_1_0_la_SOURCES += \
        pangocoretext.c         \
        pangocoretext-private.h \
        pangocoretext-fontmap.c \
+       pangocoretext-shape.c   \
        pangocairo-coretext.h   \
        pangocairo-coretextfont.c       \
        pangocairo-coretextfont.h       \
@@ -391,7 +393,7 @@ libpangowin32_1_0_la_LIBADD =                       \
        libpango-$(PANGO_API_VERSION).la        \
        $(INCLUDED_WIN32_MODULES)               \
        $(GLIB_LIBS)                            \
-       $(WIN32_LIBS)
+       -lgdi32 -lusp10
 libpangowin32_1_0_la_DEPENDENCIES =            \
        libpango-$(PANGO_API_VERSION).la        \
        $(INCLUDED_WIN32_MODULES)
@@ -402,7 +404,8 @@ libpangowin32_1_0_la_SOURCES =      \
        pangowin32.c            \
        pangowin32-private.h    \
        pangowin32-fontcache.c  \
-       pangowin32-fontmap.c
+       pangowin32-fontmap.c    \
+       pangowin32-shape.c
 
 if PLATFORM_WIN32
 libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o
diff --git a/modules/basic/basic-coretext.c b/pango/pangocoretext-shape.c
similarity index 99%
rename from modules/basic/basic-coretext.c
rename to pango/pangocoretext-shape.c
index 0a2c27f..31825ed 100644
--- a/modules/basic/basic-coretext.c
+++ b/pango/pangocoretext-shape.c
@@ -527,4 +527,3 @@ PANGO_MODULE_ENTRY(create) (const char *id)
   else
     return NULL;
 }
-
diff --git a/modules/basic/basic-fc.c b/pango/pangofc-shape.c
similarity index 100%
rename from modules/basic/basic-fc.c
rename to pango/pangofc-shape.c
diff --git a/modules/basic/basic-win32.c b/pango/pangowin32-shape.c
similarity index 100%
rename from modules/basic/basic-win32.c
rename to pango/pangowin32-shape.c