From 8a35d7dc8f5a2bc5ef4045d502fdc2ce0e5be523 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Mon, 23 Apr 2012 17:37:00 +0000 Subject: [PATCH] + compile the resource tools --- src/server/Makefile.am.alt | 4 +++- src/server/Makefile.am.orig | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt index b0312ed..362978b 100644 --- a/src/server/Makefile.am.alt +++ b/src/server/Makefile.am.alt @@ -12,6 +12,7 @@ kiwix_serve_SOURCES= \ ../common/base64.cpp \ ../common/pathTools.cpp \ ../common/regexTools.cpp \ + ../common/resourceTools.cpp \ ../common/splitString.cpp include_HEADERS= \ ../common/kiwix/reader.h \ @@ -24,7 +25,8 @@ include_HEADERS= \ ../common/base64.h \ ../common/pathTools.h \ ../common/regexTools.h \ - ../common/splitString.cpp + ../common/resourceTools.h \ + ../common/splitString.h kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/ kiwix_serve_LDFLAGS=${MICROHTTPD_LDFLAGS} $(CLUCENE_LDFLAGS) $(XAPIAN_LDFLAGS) $(ICU_LDFLAGS) $(LZMA_LDFLAGS) diff --git a/src/server/Makefile.am.orig b/src/server/Makefile.am.orig index 45917d7..d1b7e35 100644 --- a/src/server/Makefile.am.orig +++ b/src/server/Makefile.am.orig @@ -12,6 +12,7 @@ kiwix_serve_SOURCES= \ ../common/base64.cpp \ ../common/pathTools.cpp \ ../common/regexTools.cpp \ + ../common/resourceTools.cpp \ ../common/splitString.cpp include_HEADERS= \ ../common/kiwix/reader.h \ @@ -24,7 +25,8 @@ include_HEADERS= \ ../common/base64.h \ ../common/pathTools.h \ ../common/regexTools.h \ - ../common/splitString.cpp + ../common/resourceTools.h \ + ../common/splitString.h kiwix_serve_CXXFLAGS=${LIBMICROHTTPD_CFLAGS} $(LIBPUGIXML_CFLAGS) $(LIBCTPP2_CFLAGS) $(LIBCLUCENE_CFLAGS) $(LIBXAPIAN_CFLAGS) $(LIBICU_CFLAGS) $(LIBZIM_CFLAGS) -I../common/ if IS_STATIC kiwix_serve_LDFLAGS= -ldl -lm -lpthread -luuid ${LIBMICROHTTPD_STATIC_LDFLAGS} ${LIBPUGIXML_STATIC_LDFLAGS} $(LIBCTPP2_STATIC_LDFLAGS) $(LIBCLUCENE_STATIC_LDFLAGS) $(LIBXAPIAN_STATIC_LDFLAGS) $(LIBICU_STATIC_LDFLAGS) $(LIBZIMSELF_STATIC_LDFLAGS) $(LIBLZMA_STATIC_LDFLAGS) $(LIBZ_STATIC_LDFLAGS)