commit fd2e5f6892a323622dc258dda76623384d6c73fa
Author: Georg Baum <[email protected]>
Date: Thu May 5 17:36:41 2016 +0200
Add forgotten zlib includes
I forgot this in 9b822b25ae5. Also remove a comment that is no longer true.
diff --git a/3rdparty/zlib/Makefile.am b/3rdparty/zlib/Makefile.am
index ff20909..c80e963 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 ed6af57..d113729 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 \
