CLI binaries now shared (default) + --enable-staticbins for static and all.

This commit is contained in:
reg_ 2012-05-18 18:18:24 +00:00
parent 1c89b13129
commit 674b6723a5
6 changed files with 28 additions and 8 deletions

View File

@ -19,5 +19,9 @@ include_HEADERS= \
../common/kiwix/xapianIndexer.h \
../common/kiwix/cluceneIndexer.h
kiwix_index_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CFLAGS) -I../common/
if STATIC_BINS
kiwix_index_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -lpthread $(UUID_STATIC_LDFLAGS) -ldl
#kiwix_index_LDADD=../zimlib/src/.libs/libzim.a
else
kiwix_index_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_LDFLAGS) $(ZLIB_LDFLAGS) -lpthread $(UUID_LDFLAGS) -ldl
endif

View File

@ -29,5 +29,9 @@ include_HEADERS= \
../common/regexTools.h \
../common/pathTools.h
kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CLAGS) $(UUID_CFLAGS) -I../common/
if STATIC_BINS
kiwix_install_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(UUID_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -ldl -lpthread
# kiwix_install_LDADD=
else
kiwix_install_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(UUID_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) $(ZLIB_LDFLAGS) -ldl -lpthread
endif

View File

@ -18,5 +18,9 @@ include_HEADERS= \
../common/unaccent.h \
../common/pathTools.h
kiwix_manage_CXXFLAGS=$(ZIMLIB_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
if STATIC_BINS
kiwix_manage_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) -ldl
# kiwix_manage_LDADD=../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a
else
kiwix_manage_LDFLAGS=$(ZIMLIB_LDFLAGS) $(ICU_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) -ldl
endif

View File

@ -6,5 +6,9 @@ kiwix_read_SOURCES= \
include_HEADERS= \
../common/kiwix/reader.h
kiwix_read_CXXFLAGS=$(ZIMLIB_CFLAGS) $(LZMA_CFLAGS) -I../common/
if STATIC_BINS
kiwix_read_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS)
# kiwix_read_LDADD=
else
kiwix_read_LDFLAGS=$(ZIMLIB_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_LDFLAGS)
endif

View File

@ -17,9 +17,11 @@ include_HEADERS= \
../common/kiwix/cluceneSearcher.h
kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) $(ZLIB_CFLAGS) $(UUID_CFLAGS) -I../common/
if STATIC_BINS
kiwix_search_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_STATIC_LDFLAGS) -ldl -lpthread
# kiwix_search_LDADD=../ctpp2/src/.libs/libctpp2.a
else
kiwix_search_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(CTPP2_LDFLAGS) $(ZLIB_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_LDFLAGS) -ldl -lpthread
endif
if IS_OSX
kiwix_search_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation

View File

@ -29,9 +29,11 @@ include_HEADERS= \
../common/stringTools.h
kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
# kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a
if STATIC_BINS
kiwix_serve_LDFLAGS= $(XAPIAN_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(SQLITE_STATIC_LDFLAGS) $(MICROHTTPD_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) -ldl $(UUID_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -lpthread
else
kiwix_serve_LDFLAGS= $(XAPIAN_LDFLAGS) $(ICU_LDFLAGS) $(SQLITE_LDFLAGS) $(MICROHTTPD_LDFLAGS) ../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) $(CLUCENE_LDFLAGS) -ldl $(UUID_LDFLAGS) $(ZLIB_LDFLAGS) -lpthread
endif
if IS_OSX
kiwix_serve_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation