diff options
Diffstat (limited to 'Build/source/libs/poppler')
-rw-r--r-- | Build/source/libs/poppler/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/Makefile.in | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index bd42ca1f59d..edac98738a0 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-10-15 Peter Breitenlohner <peb@mppmu.mpg.de> Import poppler-0.21.0. diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am index 51bc686c3b4..9053425f09b 100644 --- a/Build/source/libs/poppler/Makefile.am +++ b/Build/source/libs/poppler/Makefile.am @@ -30,8 +30,8 @@ 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) $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DPOPPLER_DATADIR='"."' +AM_CPPFLAGS = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES) +AM_CPPFLAGS += -DPOPPLER_DATADIR='"."' AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index 67036341a35..f1daf354bed 100644 --- a/Build/source/libs/poppler/Makefile.in +++ b/Build/source/libs/poppler/Makefile.in @@ -289,8 +289,8 @@ SUBDIRS = goo fofi poppler 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) $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DPOPPLER_DATADIR='"."' +AM_CPPFLAGS = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) \ + -I$(POPPLER_SRC) $(ZLIB_INCLUDES) -DPOPPLER_DATADIR='"."' AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) noinst_LIBRARIES = libpoppler.a |