From f3d409dc10f5adc803a94f122c25fd51b2bba833 Mon Sep 17 00:00:00 2001 From: reg_ Date: Wed, 30 May 2012 15:36:55 +0000 Subject: [PATCH] static bins are now real complete static ones --- src/indexer/Makefile.am.alt | 2 +- src/installer/Makefile.am.alt | 2 +- src/manager/Makefile.am.alt | 6 +++--- src/reader/Makefile.am.alt | 2 +- src/searcher/Makefile.am.alt | 2 +- src/server/Makefile.am.alt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/indexer/Makefile.am.alt b/src/indexer/Makefile.am.alt index c5c1fd1..ba9fb7b 100644 --- a/src/indexer/Makefile.am.alt +++ b/src/indexer/Makefile.am.alt @@ -23,7 +23,7 @@ kiwix_index_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFL kiwix_index_LDFLAGS=$(CHECK_LDFLAGS) 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_LDFLAGS+= $(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) $(UUID_STATIC_LDFLAGS) $(STATIC_LIBM_ARCHIVE) $(STATIC_LIBSTDCPP_ARCHIVE) $(STATIC_LIBDL_ARCHIVE) $(STATIC_LIBGCC_ARCHIVE) $(STATIC_LIBPTHREAD_ARCHIVE) --static else kiwix_index_LDFLAGS+= $(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_LDFLAGS) $(ZLIB_LDFLAGS) -lpthread $(UUID_LDFLAGS) -ldl endif diff --git a/src/installer/Makefile.am.alt b/src/installer/Makefile.am.alt index 97fe735..75a9032 100644 --- a/src/installer/Makefile.am.alt +++ b/src/installer/Makefile.am.alt @@ -33,7 +33,7 @@ kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_C kiwix_install_LDFLAGS=$(CHECK_LDFLAGS) 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_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) $(STATIC_LIBM_ARCHIVE) $(STATIC_LIBSTDCPP_ARCHIVE) $(STATIC_LIBDL_ARCHIVE) $(STATIC_LIBGCC_ARCHIVE) $(STATIC_LIBPTHREAD_ARCHIVE) --static 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 \ No newline at end of file diff --git a/src/manager/Makefile.am.alt b/src/manager/Makefile.am.alt index fe8b273..b8d5977 100644 --- a/src/manager/Makefile.am.alt +++ b/src/manager/Makefile.am.alt @@ -16,13 +16,13 @@ include_HEADERS= \ ../common/base64.h \ ../common/regexTools.h \ ../common/unaccent.h \ - ../common/pathTools.h + ../common/pathTools.h kiwix_manage_CXXFLAGS=$(ZIMLIB_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/ -kiwix_manage_LDFLAGS=$(CHECK_LDFLAGS) +kiwix_manage_LDFLAGS= $(CHECK_LDFLAGS) 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_LDFLAGS+= $(CHECK_LDFLAGS) $(ZIMLIB_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(STATIC_LIBM_ARCHIVE) $(STATIC_LIBSTDCPP_ARCHIVE) $(STATIC_LIBDL_ARCHIVE) $(STATIC_LIBGCC_ARCHIVE) $(STATIC_LIBPTHREAD_ARCHIVE) --static else kiwix_manage_LDFLAGS+= $(ZIMLIB_LDFLAGS) $(ICU_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) -ldl endif diff --git a/src/reader/Makefile.am.alt b/src/reader/Makefile.am.alt index 53e1153..ee5758e 100644 --- a/src/reader/Makefile.am.alt +++ b/src/reader/Makefile.am.alt @@ -10,7 +10,7 @@ kiwix_read_CXXFLAGS=$(ZIMLIB_CFLAGS) $(LZMA_CFLAGS) -I../common/ kiwix_read_LDFLAGS=$(CHECK_LDFLAGS) if STATIC_BINS -kiwix_read_LDFLAGS+= $(ZIMLIB_STATIC_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS) +kiwix_read_LDFLAGS+= $(ZIMLIB_STATIC_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS) $(STATIC_LIBM_ARCHIVE) $(STATIC_LIBSTDCPP_ARCHIVE) --static else kiwix_read_LDFLAGS+= $(ZIMLIB_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_LDFLAGS) endif diff --git a/src/searcher/Makefile.am.alt b/src/searcher/Makefile.am.alt index b09f0de..4b3f6b2 100644 --- a/src/searcher/Makefile.am.alt +++ b/src/searcher/Makefile.am.alt @@ -20,7 +20,7 @@ kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_C kiwix_search_LDFLAGS=$(CHECK_LDFLAGS) 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_LDFLAGS+= $(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_STATIC_LDFLAGS) $(STATIC_LIBM_ARCHIVE) $(STATIC_LIBSTDCPP_ARCHIVE) $(STATIC_LIBDL_ARCHIVE) $(STATIC_LIBGCC_ARCHIVE) $(STATIC_LIBPTHREAD_ARCHIVE) --static else kiwix_search_LDFLAGS+= $(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(CTPP2_LDFLAGS) $(ZLIB_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_LDFLAGS) -ldl -lpthread endif diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt index a457440..db3af8c 100644 --- a/src/server/Makefile.am.alt +++ b/src/server/Makefile.am.alt @@ -32,7 +32,7 @@ kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $( kiwix_serve_LDFLAGS=$(CHECK_LDFLAGS) if STATIC_BINS -kiwix_serve_LDFLAGS+= $(XAPIAN_STATIC_LDFLAGS) $(ICU_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 +kiwix_serve_LDFLAGS+= $(XAPIAN_STATIC_LDFLAGS) $(ICU_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) $(UUID_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) $(STATIC_LIBM_ARCHIVE) $(STATIC_LIBSTDCPP_ARCHIVE) $(STATIC_LIBDL_ARCHIVE) $(STATIC_LIBGCC_ARCHIVE) $(STATIC_LIBPTHREAD_ARCHIVE) --static else kiwix_serve_LDFLAGS+= $(XAPIAN_LDFLAGS) $(ICU_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