diff options
Diffstat (limited to 'modules/basic/Makefile.am')
| -rw-r--r-- | modules/basic/Makefile.am | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index f9ed1bf6..a655db71 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -14,8 +14,7 @@ INCLUDES = \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango/ \ - $(GLIB_CFLAGS) \ - $(moddefine) + $(GLIB_CFLAGS) if PLATFORM_WIN32 no_undefined = -no-undefined @@ -25,13 +24,10 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules module_LTLIBRARIES = noinst_LTLIBRARIES = -moddefine = - if HAVE_X INCLUDES += $(X_CFLAGS) if INCLUDE_BASIC_X noinst_LTLIBRARIES += libpango-basic-x.la -INCLUDES += -DX_MODULE_PREFIX else module_LTLIBRARIES += pango-basic-x.la endif @@ -41,13 +37,13 @@ pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module pango_basic_x_la_LIBADD = $(pangoxlibs) pango_basic_x_la_SOURCES = basic-x.c libpango_basic_x_la_SOURCES = basic-x.c +libpango_basic_x_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_x if HAVE_XFT INCLUDES += $(XFT_CFLAGS) if INCLUDE_BASIC_XFT noinst_LTLIBRARIES += libpango-basic-xft.la -INCLUDES += -DXFT_MODULE_PREFIX else module_LTLIBRARIES += pango-basic-xft.la endif @@ -55,15 +51,16 @@ endif pango_basic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module pango_basic_xft_la_LIBADD = $(pangoxftlibs) -pango_basic_xft_la_SOURCES = basic-xft.c -libpango_basic_xft_la_SOURCES = basic-xft.c +pango_basic_xft_la_SOURCES = basic-fc.c +pango_basic_xft_la_CFLAGS = -DBUILD_XFT +libpango_basic_xft_la_SOURCES = basic-fc.c +libpango_basic_xft_la_CFLAGS = -DBUILD_XFT -DPANGO_MODULE_PREFIX=_pango_basic_xft if HAVE_FREETYPE INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_BASIC_FT2 noinst_LTLIBRARIES += libpango-basic-ft2.la -INCLUDES += -DFT2_MODULE_PREFIX else module_LTLIBRARIES += pango-basic-ft2.la endif @@ -71,14 +68,15 @@ endif pango_basic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) pango_basic_ft2_la_LIBADD = $(pangoft2libs) -pango_basic_ft2_la_SOURCES = basic-ft2.c -libpango_basic_ft2_la_SOURCES = basic-ft2.c +pango_basic_ft2_la_SOURCES = basic-fc.c +pango_basic_ft2_la_CFLAGS = -DBUILD_FT2 +libpango_basic_ft2_la_SOURCES = basic-fc.c +libpango_basic_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_basic_ft2 if HAVE_WIN32 if INCLUDE_BASIC_WIN32 noinst_LTLIBRARIES += libpango-basic-win32.la -moddefine += -DWIN32_MODULE_PREFIX else module_LTLIBRARIES += pango-basic-win32.la endif @@ -88,6 +86,7 @@ pango_basic_win32_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undef pango_basic_win32_la_LIBADD = $(pangowin32libs) -lgdi32 pango_basic_win32_la_SOURCES = basic-win32.c libpango_basic_win32_la_SOURCES = basic-win32.c +libpango_basic_win32_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_win32 if HAVE_USP10_H basic-win32.lo: usp10.h |