From 127e5b1955af5edc9000c8c8c9fb40494a5f2096 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 5 May 2016 17:36:41 +0200 Subject: [PATCH] Add forgotten zlib includes I forgot this in 9b822b25ae5. Also remove a comment that is no longer true. --- 3rdparty/zlib/Makefile.am | 3 --- src/support/Makefile.am | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/3rdparty/zlib/Makefile.am b/3rdparty/zlib/Makefile.am index ff20909f2c..c80e963a1d 100644 --- a/3rdparty/zlib/Makefile.am +++ b/3rdparty/zlib/Makefile.am @@ -1,8 +1,5 @@ include $(top_srcdir)/config/common.am -# This is prepared for compilation, but currently only used for packaging, -# because configure support for compilation is still missing. - noinst_LIBRARIES = liblyxzlib.a EXTRA_DIST = \ diff --git a/src/support/Makefile.am b/src/support/Makefile.am index ed6af579d1..d1137290ee 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -26,7 +26,8 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES) # ################################################################## -AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(QT_CPPFLAGS) $(QT_INCLUDES) +AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES) \ + $(QT_CPPFLAGS) $(QT_INCLUDES) liblyxsupport_a_SOURCES = \ FileMonitor.h \