diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-04-14 16:19:18 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-04-14 16:19:18 +0000 |
commit | 7a3c6f66dd4ba13faaf4bb6153984d435ca4d8f3 (patch) | |
tree | 20768b21cc4a6221eb7b672dd99c2f972c2cabb5 /Build/source/libs/poppler/Makefile.am | |
parent | 7c3f181e032655af0a5e3dd571f5bf6b76722e80 (diff) |
luaTeX and poppler build system updates
git-svn-id: svn://tug.org/texlive/trunk@22085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/poppler/Makefile.am')
-rw-r--r-- | Build/source/libs/poppler/Makefile.am | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am index 86a3f311427..9d443e43dee 100644 --- a/Build/source/libs/poppler/Makefile.am +++ b/Build/source/libs/poppler/Makefile.am @@ -6,17 +6,6 @@ ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -#======================================================================== -## -## Main poppler Makefile. -## Goo library Makefile -## FoFi library Makefile -## poppler Makefile -## -## Copyright 1996-2003 Glyph & Cog, LLC -## -#======================================================================== -## ACLOCAL_AMFLAGS = -I ../../m4 # Rebuild @@ -41,8 +30,9 @@ GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler -INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) +INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES) AM_CPPFLAGS = -DPDF_PARSER_ONLY -DPOPPLER_DATADIR='"."' +AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libpoppler.a @@ -84,6 +74,7 @@ poppler_libpoppler_a_sources = \ $(POPPLER_SRC)/Dict.cc \ $(POPPLER_SRC)/Error.cc \ $(POPPLER_SRC)/FileSpec.cc \ + $(POPPLER_SRC)/FlateStream.cc \ $(POPPLER_SRC)/FontEncodingTables.cc \ $(POPPLER_SRC)/FontInfo.cc \ $(POPPLER_SRC)/Form.cc \ @@ -122,3 +113,14 @@ poppler_libpoppler_a_sources = \ $(POPPLER_SRC)/XRef.cc \ $(POPPLER_SRC)/XpdfPluginAPI.cc +$(libpoppler_a_OBJECTS): config.force + +config.force: $(ZLIB_DEPEND) + echo timestamp >config.force + $(SHELL) ./config.status --recheck + +DISTCLEANFILES = config.force + +## Rebuild zlib +@ZLIB_RULE@ + |