From 25b22bc54db19304db102808d7e2b87571e64b51 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Tue, 21 Aug 2007 20:40:02 +0000 Subject: [PATCH] Add autotools support for src/support/minizip stuff git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19699 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/Makefile.am | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 41b8177e19..e30d039128 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -13,7 +13,11 @@ liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS) BUILT_SOURCES = $(PCH_FILE) Package.cpp AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) -AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) +AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) -I$(srcdir)/minizip + +# force the use of C++ compiler for minizip/*.c files, because +# gcc can not go through the included boost files. +liblyxsupport_la_CFLAGS = -x c++ liblyxsupport_la_SOURCES = \ FileMonitor.h \ @@ -88,8 +92,20 @@ liblyxsupport_la_SOURCES = \ userinfo.h \ unicode.cpp \ unicode.h \ - unlink.cpp - + unlink.cpp \ + minizip/crypt.h \ + minizip/ioapi.c \ + minizip/ioapi.h \ + minizip/unzip.c \ + minizip/unzip.h \ + minizip/zip.c \ + minizip/zip.h + +# FIXME: the following two files are for windows only. I do not know +# how to add them conditionally. autotools are rarely used under windows +# anyway. +# minizip/iowin32.c +# minizip/iowin32.h Package.cpp: build_package -- 2.39.5