diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2015-04-04 18:46:20 -0700 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2015-04-04 18:48:43 -0700 |
commit | 137832fa931e875b900dedd1c8909b46d1f7e8ad (patch) | |
tree | a9086e8e1f7707a4cc92369491c28d392f827018 /pango/Makefile.am | |
parent | ef69cbb18b00d7e454cf881a8f58bdabad04ecef (diff) | |
download | pango-137832fa931e875b900dedd1c8909b46d1f7e8ad.tar.gz |
[modules] Move language modules in source tree and remove modules/
This should complete the kill-modules effort. What is left is leftover
removal and unbreaking stuff.
Bug 733882 - Kill Pango modules, engines, and config files
Diffstat (limited to 'pango/Makefile.am')
-rw-r--r-- | pango/Makefile.am | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index d1561e23..f5ad2d0b 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -46,13 +46,10 @@ INTROSPECTION_GIRS += Pango-1.0.gir libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) libpango_1_0_la_LIBADD = \ $(GLIB_LIBS) \ - $(libm) \ - $(INCLUDED_LANG_MODULES) -libpango_1_0_la_DEPENDENCIES = \ - $(INCLUDED_LANG_MODULES) + $(libm) libpango_1_0_la_LIBADD += mini-fribidi/libmini-fribidi.la -libpango_1_0_la_DEPENDENCIES += mini-fribidi/libmini-fribidi.la +libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la if PLATFORM_WIN32 libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o @@ -95,8 +92,7 @@ libpango_1_0_la_SOURCES = \ pango-utils.c \ reorder-items.c \ shape.c \ - pango-enum-types.c \ - module-defs-lang.c + pango-enum-types.c pango_headers = \ pango.h \ @@ -189,18 +185,15 @@ pangoft2_public_sources = \ libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) libpangoft2_1_0_la_LIBADD = \ libpango-$(PANGO_API_VERSION).la \ - $(INCLUDED_FC_MODULES) \ $(GLIB_LIBS) \ $(HARFBUZZ_LIBS) \ $(FREETYPE_LIBS) \ $(libm) libpangoft2_1_0_la_DEPENDENCIES = \ - libpango-$(PANGO_API_VERSION).la \ - $(INCLUDED_FC_MODULES) + libpango-$(PANGO_API_VERSION).la libpangoft2_1_0_la_SOURCES = \ $(pangoft2_public_sources) \ modules.h \ - module-defs-fc.c \ pangofc-private.h \ pangoft2.h \ pangoft2-private.h \ @@ -343,7 +336,6 @@ if HAVE_CAIRO_QUARTZ if HAVE_CORE_TEXT libpangocairo_1_0_la_SOURCES += \ modules.h \ - module-defs-coretext.c \ pangocoretext.h \ pangocoretext.c \ pangocoretext-private.h \ @@ -356,7 +348,6 @@ libpangocairo_1_0_la_SOURCES += \ pangoinclude_HEADERS += pangocoretext.h libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework ApplicationServices -libpangocairo_1_0_la_LIBADD += $(INCLUDED_CORE_TEXT_MODULES) # We don't have an CoreText GIR right now, so this is just hypothetical # PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoCoreText-1.0.gir endif @@ -391,15 +382,12 @@ endif libpangowin32_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) libpangowin32_1_0_la_LIBADD = \ libpango-$(PANGO_API_VERSION).la \ - $(INCLUDED_WIN32_MODULES) \ $(GLIB_LIBS) \ -lgdi32 -lusp10 libpangowin32_1_0_la_DEPENDENCIES = \ - libpango-$(PANGO_API_VERSION).la \ - $(INCLUDED_WIN32_MODULES) + libpango-$(PANGO_API_VERSION).la libpangowin32_1_0_la_SOURCES = \ modules.h \ - module-defs-win32.c \ pangowin32.h \ pangowin32.c \ pangowin32-private.h \ @@ -432,11 +420,6 @@ EXTRA_DIST = \ pango-enum-types.h \ pango-enum-types.h.template \ pango-enum-types.c.template \ - module-defs.h \ - module-defs.h.win32 \ - module-defs-lang.c.win32 \ - module-defs-fc.c.win32 \ - module-defs-win32.c.win32 \ pango.def \ pangocairo.def \ pangowin32.def \ @@ -455,24 +438,6 @@ EXTRA_DIST = \ check.defs -modules: - $(AM_V_GEN) cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) - -$(INCLUDED_LANG_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES) $(INCLUDED_CORE_TEXT_MODULES): modules - $(AM_V_GEN) true - -.PHONY: modules - -MODULE_DEF_FILES = \ - module-defs.h \ - module-defs-lang.c \ - module-defs-fc.c \ - module-defs-win32.c \ - module-defs-coretext.c - -$(MODULE_DEF_FILES): $(top_builddir)/config.status - $(AM_V_GEN) cd $(top_builddir) && $(SHELL) ./config.status pango/$@ - include $(top_srcdir)/build/Makefile-msvcproj.am dist-hook: $(pango_vcproj_stuff) @@ -491,7 +456,6 @@ MOSTLYCLEANFILES = \ DISTCLEANFILES = \ pango-features.h \ - $(MODULE_DEF_FILES) \ $(pango_vcproj_stuff) install-exec-hook: |