diff options
author | Sven Neumann <sven@gimp.org> | 2001-03-15 05:59:03 +0000 |
---|---|---|
committer | Sven Neumann <neo@src.gnome.org> | 2001-03-15 05:59:03 +0000 |
commit | 4133033f2fc761441cc14b5aaf602a749db8fd1a (patch) | |
tree | 367c9d5e37747bc028548642a41f5f02d7ace8fe /modules | |
parent | 2ebe73ff42ea4cf55421d1a28f6cd1ef32aaa632 (diff) | |
download | pango-4133033f2fc761441cc14b5aaf602a749db8fd1a.tar.gz |
Makefile.am configure.in modules/*/Makefile.am make it compile without X
2001-03-15 Sven Neumann <sven@gimp.org>
* Makefile.am
* configure.in
* modules/*/Makefile.am
* pango/Makefile.am: make it compile without X headers
Diffstat (limited to 'modules')
-rw-r--r-- | modules/arabic/Makefile.am | 7 | ||||
-rw-r--r-- | modules/basic/Makefile.am | 6 | ||||
-rw-r--r-- | modules/hangul/Makefile.am | 2 | ||||
-rw-r--r-- | modules/indic/Makefile.am | 4 | ||||
-rw-r--r-- | modules/tamil/Makefile.am | 2 | ||||
-rw-r--r-- | modules/thai/Makefile.am | 2 |
6 files changed, 22 insertions, 1 deletions
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index c456342d..4516fa99 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -31,6 +31,7 @@ xft_sources = \ arabic-ot.c \ arabic-ot.h +if HAVE_X if INCLUDE_ARABIC_X X_MODULES= X_INCLUDED=libpango-arabic-x.la @@ -40,7 +41,11 @@ X_MODULES=pango-arabic-x.la X_INCLUDED= X_PREFIX= endif - +else +X_MODULES= +X_INCLUDED= +X_PREFIX= +endif noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 8bcd7afb..07001520 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -34,6 +34,7 @@ FT2_INCLUDED= FT2_PREFIX= endif +if HAVE_X if INCLUDE_BASIC_X X_INCLUDED=libpango-basic-x.la X_MODULES= @@ -43,6 +44,11 @@ X_INCLUDED= X_MODULES=pango-basic-x.la X_PREFIX= endif +else +X_INCLUDED= +X_MODULES= +X_PREFIX= +endif noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index a2d9f424..e82c1a17 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -2,6 +2,7 @@ sources = hangul-x.c +if HAVE_X if INCLUDE_HANGUL_X noinst_LTLIBRARIES = libpango-hangul-x.la moddefine = -DX_MODULE_PREFIX @@ -10,6 +11,7 @@ moduledir = $(libdir)/pango/modules module_LTLIBRARIES = pango-hangul-x.la moduleflags= -rpath $(libdir) endif +endif INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index 31fc0dcc..7fde2ba9 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -8,6 +8,8 @@ sources = \ devanagari-x.c \ pango-indic-script.h +if HAVE_X + if INCLUDE_MYANMAR_X myanmar_x_noinst=libpango-myanmar-x.la myanmar_x_cflags=-DMYANMAR_X_MODULE_PREFIX @@ -55,6 +57,8 @@ moduledir = $(libdir)/pango/modules module_LTLIBRARIES = $(myanmar_x_inst) $(gurmukhi_x_inst) $(bengali_x_inst) $(devanagari_x_inst) $(gujarati_x_inst) endif +endif + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(X_CFLAGS) $(myanmar_x_cflags) $(gurmukhi_x_cflags) $(bengali_x_cflags) $(devanagari_x_cflags) $(gujarati_x_cflags) EXTRA_DIST = \ diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index fe8dd5b6..fc84f81c 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -2,6 +2,7 @@ sources = tamil-x.c taconv.c taconv.h tadefs.h +if HAVE_X if INCLUDE_TAMIL_X noinst_LTLIBRARIES = libpango-tamil-x.la moddefine = -DX_MODULE_PREFIX @@ -10,6 +11,7 @@ moduledir = $(libdir)/pango/modules module_LTLIBRARIES = pango-tamil-x.la moduleflags=-rpath $(libdir) endif +endif INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 7be44adc..3b22ed78 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -2,6 +2,7 @@ sources = thai-x.c +if HAVE_X if INCLUDE_THAI_X noinst_LTLIBRARIES = libpango-thai-x.la moddefine = -DX_MODULE_PREFIX @@ -10,6 +11,7 @@ moduledir = $(libdir)/pango/modules module_LTLIBRARIES = pango-thai-x.la moduleflags=-rpath $(libdir) endif +endif INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) |