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 /pango/Makefile.am | |
| 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 'pango/Makefile.am')
| -rw-r--r-- | pango/Makefile.am | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 8114d6a5..17dc9c00 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -20,6 +20,14 @@ INCLUDES = \ $(FREETYPE_CFLAGS) \ -I$(top_srcdir) +if HAVE_X +X_HFILES=pangox.h +X_BUILD_LIBS=libpangox.la +else +X_HFILES= +X_BUILD_LIBS= +endif + if HAVE_XFT XFT_HFILES=pangoxft.h pango-ot.h XFT_BUILD_LIBS=libpangoxft.la @@ -37,7 +45,7 @@ FT2_HFILES= endif -lib_LTLIBRARIES = libpango.la libpangox.la $(XFT_BUILD_LIBS) $(FT2_BUILD_LIBS) +lib_LTLIBRARIES = libpango.la $(X_BUILD_LIBS) $(XFT_BUILD_LIBS) $(FT2_BUILD_LIBS) bin_PROGRAMS = pango-querymodules @@ -125,12 +133,12 @@ pango_headers= \ pango-modules.h \ pango-tabs.h \ pango-types.h \ - pango-utils.h \ - pangox.h + pango-utils.h pangoinclude_HEADERS = \ $(pango_headers) \ $(pango_built_headers) \ + $(X_HFILES) \ $(XFT_HFILES) \ $(FT2_HFILES) @@ -149,9 +157,9 @@ pango_querymodules_SOURCES = \ querymodules.c if HAVE_XFT -pango_querymodules_LDADD = $(FT2_BUILD_LIBS) libpangox.la libpangoxft.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS) +pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS) else -pango_querymodules_LDADD = $(FT2_BUILD_LIBS) libpangox.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) +pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) endif EXTRA_DIST = \ |