From 6eb2c59a54a5b7249fc3dba57be804eb99f2effc Mon Sep 17 00:00:00 2001 From: reg_ Date: Fri, 20 Apr 2012 14:06:56 +0000 Subject: [PATCH] progress on switch to copied shared libs + static for binaries --- src/server/Makefile.am.alt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt index ffd5d49..b0312ed 100644 --- a/src/server/Makefile.am.alt +++ b/src/server/Makefile.am.alt @@ -28,4 +28,12 @@ include_HEADERS= \ 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) -kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a \ No newline at end of file +kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a + +# kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) ${ZLIB_CFLAGS} -I../common/ + +# kiwix_serve_LDFLAGS= $(ZLIB_STATIC_LDFLAGS) $(COMPILED_XAPIAN_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(SQLITE_STATIC_LDFLAGS) $(MICROHTTPD_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) + +if IS_OSX +kiwix_serve_LDFLAGS+= -framework IOKit -framework CoreFoundation +endif