fixed compilation on linux

pull/9/head
reg_ 14 years ago
parent 8d179edf68
commit f338add564

@ -19,5 +19,5 @@ 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/
kiwix_index_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS)
kiwix_index_LDADD=../zimlib/src/.libs/libzim.a
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

@ -28,6 +28,6 @@ include_HEADERS= \
../common/kiwix/manager.h \
../common/regexTools.h \
../common/pathTools.h
kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) -I../common/
kiwix_install_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS)
kiwix_install_LDADD=../zimlib/src/libzim.la ../pugixml/libpugixml.la
kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CLAGS) $(UUID_CFLAGS) -I../common/
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
# kiwix_install_LDADD=

@ -18,5 +18,5 @@ include_HEADERS= \
../common/unaccent.h \
../common/pathTools.h
kiwix_manage_CXXFLAGS=$(ZIMLIB_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
kiwix_manage_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS)
kiwix_manage_LDADD=../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a
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

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

@ -15,11 +15,11 @@ include_HEADERS= \
../common/stringTools.h \
../common/kiwix/xapianSearcher.h \
../common/kiwix/cluceneSearcher.h
kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) $(ZLIB_CFLAGS) -I../common/
kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) $(ZLIB_CFLAGS) $(UUID_CFLAGS) -I../common/
kiwix_search_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS)
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
kiwix_search_LDADD=../ctpp2/src/.libs/libctpp2.a
# kiwix_search_LDADD=../ctpp2/src/.libs/libctpp2.a
if IS_OSX
kiwix_search_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation

@ -29,9 +29,9 @@ 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
# kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a
kiwix_serve_LDFLAGS= $(ZLIB_STATIC_LDFLAGS) $(XAPIAN_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(SQLITE_STATIC_LDFLAGS) $(MICROHTTPD_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS)
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)
if IS_OSX
kiwix_serve_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation

@ -30,6 +30,6 @@ libzim_la_SOURCES = \
md5.h
libzim_la_CXXFLAGS=${LZMA_CFLAGS} -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
libzim_la_LDFLAGS=${LZMA_LDFLAGS}
libzim_la_LDFLAGS=${LZMA_STATIC_LDFLAGS}
CLEANFILES=*.obj *.lib *.dll
Loading…
Cancel
Save