diff --git a/src/Makefile.am.alt b/src/Makefile.am.alt deleted file mode 100644 index 994dddd..0000000 --- a/src/Makefile.am.alt +++ /dev/null @@ -1,35 +0,0 @@ -SUBDIRS = man zimlib ctpp2 pugixml - -if WITH_COMPONENTS -SUBDIRS += components -endif - -if WITH_MANAGER -SUBDIRS += manager -endif - -if WITH_SERVER -SUBDIRS += server -endif - -if WITH_INDEXER -SUBDIRS += indexer -endif - -if WITH_INSTALLER -SUBDIRS += installer -endif - -if WITH_SEARCHER -SUBDIRS += searcher -endif - -if WITH_READER -SUBDIRS += reader -endif - -if WITH_LAUNCHER -SUBDIRS += launcher -endif - -EXTRA_DIST = dependencies \ No newline at end of file diff --git a/src/Makefile.am.orig b/src/Makefile.am.orig deleted file mode 100644 index db933f6..0000000 --- a/src/Makefile.am.orig +++ /dev/null @@ -1,24 +0,0 @@ -if IS_OSX -SUBDIRS = ${DEPENDENCES} \ - zimlib \ - ctpp2 \ - pugixml \ - components \ - manager \ - dependences -else -SUBDIRS = ${DEPENDENCES} \ - zimlib \ - ctpp2 \ - pugixml \ - components \ - server \ - manager -if IS_STATIC -else -SUBDIRS += indexer \ - installer \ - searcher \ - reader -endif -endif diff --git a/src/ctpp2/Makefile.am.alt b/src/ctpp2/Makefile.am.alt deleted file mode 100644 index 6770d02..0000000 --- a/src/ctpp2/Makefile.am.alt +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS=src -EXTRA_DIST=include \ No newline at end of file diff --git a/src/ctpp2/Makefile.am.orig b/src/ctpp2/Makefile.am.orig deleted file mode 100644 index ba43967..0000000 --- a/src/ctpp2/Makefile.am.orig +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS=src -EXTRA_DIST=include diff --git a/src/ctpp2/src/Makefile.am.alt b/src/ctpp2/src/Makefile.am.alt deleted file mode 100644 index 8e50449..0000000 --- a/src/ctpp2/src/Makefile.am.alt +++ /dev/null @@ -1,95 +0,0 @@ -AM_CPPFLAGS=-I$(top_srcdir)/src/ctpp2/include -I$(top_srcdir)/src/ctpp2/include/functions - -noinst_LTLIBRARIES = libctpp2.la - -libctpp2_la_SOURCES = \ - CTPP2Logger.cpp \ - CTPP2VMExecutable.cpp \ - CTPP2JSONFileParser.cpp \ - CTPP2FileSourceLoader.cpp \ - CTPP2VMMemoryCore.cpp \ - CTPP2VMOpcodeCollector.cpp \ - CTPP2VMArgStack.cpp \ - CTPP2FileOutputCollector.cpp \ - CTPP2Compiler.cpp \ - CTPP2VMFileLoader.cpp \ - CTPP2BitIndex.cpp \ - CTPP2VMException.cpp \ - CTPP2StreamOutputCollector.cpp \ - CTPP2StringBuffer.cpp \ - CDTSortRoutines.cpp \ - CTPP2VMDebugInfo.cpp \ - CTPP2SyscallFactory.cpp \ - CTPP2HashTable.cpp \ - CTPP2Exception.cpp \ - CTPP2Sprintf.cpp \ - CTPP2StaticData.cpp \ - CDT.cpp \ - CTPP2VMSTDLib.cpp \ - CTPP2VMSyscall.cpp \ - CTPP2ParserException.cpp \ - CTPP2VM.cpp \ - CTPP2FileLogger.cpp \ - CTPP2Parser.cpp \ - CTPP2Error.cpp \ - CTPP2StaticText.cpp \ - CTPP2StringOutputCollector.cpp \ - CTPP2VMCodeStack.cpp \ - CTPP2TextLoader.cpp \ - functions/FnBase64Encode.cpp \ - functions/FnInSet.cpp \ - functions/FnSubstring.cpp \ - functions/FnGetText.cpp \ - functions/FnMin.cpp \ - functions/FnMBSubstring.cpp \ - functions/FnVersion.cpp \ - functions/FnListElement.cpp \ - functions/FnMax.cpp \ - functions/FnConcat.cpp \ - functions/FnSize.cpp \ - functions/FnMBSize.cpp \ - functions/FnBase64Decode.cpp \ - functions/FnFormParam.cpp \ - functions/FnXMLEscape.cpp \ - functions/FnWMLEscape.cpp \ - functions/FnHMACMD5.cpp \ - functions/FnDateFormat.cpp \ - functions/FnHTMLEscape.cpp \ - functions/FnTruncate.cpp \ - functions/FnURLEscape.cpp \ - functions/FnIconv.cpp \ - functions/FnURIEscape.cpp \ - functions/FnNumFormat.cpp \ - functions/FnMD5.cpp \ - functions/FnGetText_.cpp \ - functions/FnJSEscape.cpp \ - functions/FnDefined.cpp \ - functions/FnSprintf.cpp \ - functions/FnHrefParam.cpp \ - functions/FnCast.cpp \ - functions/FnJSON.cpp \ - functions/FnRandom.cpp \ - functions/FnLog.cpp \ - functions/FnObjDump.cpp \ - functions/FnMBTruncate.cpp \ - functions/FnDefault.cpp \ - functions/FnNumeral.cpp \ - functions/FnAvg.cpp \ - functions/FnEmitter.cpp \ - functions/FnError.cpp \ - functions/FnHashElement.cpp \ - functions/FnArrayElement.cpp \ - CTPP2VMDumper.cpp \ - CTPP2JSONParser.cpp \ - CTPP2DTOA.cpp \ - CTPP2Util.cpp - -libctpp2_la_CXXFLAGS=-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - -if IS_OSX -libctpp2_la_CXXFLAGS+= -I/opt/local/include -endif - -libctpp2_la_LDFLAGS=$(CHECK_LDFLAGS) - -CLEANFILES=*.obj *.lib *.dll \ No newline at end of file diff --git a/src/ctpp2/src/Makefile.am.orig b/src/ctpp2/src/Makefile.am.orig deleted file mode 100644 index c50c9d2..0000000 --- a/src/ctpp2/src/Makefile.am.orig +++ /dev/null @@ -1,94 +0,0 @@ -AM_CPPFLAGS=-I$(top_srcdir)/src/ctpp2/include -I$(top_srcdir)/src/ctpp2/include/functions - -noinst_LTLIBRARIES = libctpp2.la - -libctpp2_la_SOURCES = \ - CTPP2Logger.cpp \ - CTPP2VMExecutable.cpp \ - CTPP2JSONFileParser.cpp \ - CTPP2FileSourceLoader.cpp \ - CTPP2TextLoader.cpp \ - CTPP2VMMemoryCore.cpp \ - CTPP2VMOpcodeCollector.cpp \ - CTPP2VMArgStack.cpp \ - CTPP2FileOutputCollector.cpp \ - CTPP2Compiler.cpp \ - CTPP2VMFileLoader.cpp \ - CTPP2BitIndex.cpp \ - CTPP2VMException.cpp \ - CTPP2StreamOutputCollector.cpp \ - CTPP2StringBuffer.cpp \ - CDTSortRoutines.cpp \ - CTPP2VMDebugInfo.cpp \ - CTPP2SyscallFactory.cpp \ - CTPP2HashTable.cpp \ - CTPP2Exception.cpp \ - CTPP2Sprintf.cpp \ - CTPP2StaticData.cpp \ - CDT.cpp \ - CTPP2VMSTDLib.cpp \ - CTPP2VMSyscall.cpp \ - CTPP2ParserException.cpp \ - CTPP2VM.cpp \ - CTPP2FileLogger.cpp \ - CTPP2Parser.cpp \ - CTPP2Error.cpp \ - CTPP2StaticText.cpp \ - CTPP2StringOutputCollector.cpp \ - CTPP2VMCodeStack.cpp \ - functions/FnBase64Encode.cpp \ - functions/FnInSet.cpp \ - functions/FnSubstring.cpp \ - functions/FnGetText.cpp \ - functions/FnMin.cpp \ - functions/FnMBSubstring.cpp \ - functions/FnVersion.cpp \ - functions/FnListElement.cpp \ - functions/FnMax.cpp \ - functions/FnConcat.cpp \ - functions/FnSize.cpp \ - functions/FnMBSize.cpp \ - functions/FnBase64Decode.cpp \ - functions/FnFormParam.cpp \ - functions/FnXMLEscape.cpp \ - functions/FnWMLEscape.cpp \ - functions/FnHMACMD5.cpp \ - functions/FnDateFormat.cpp \ - functions/FnHTMLEscape.cpp \ - functions/FnTruncate.cpp \ - functions/FnURLEscape.cpp \ - functions/FnIconv.cpp \ - functions/FnURIEscape.cpp \ - functions/FnNumFormat.cpp \ - functions/FnMD5.cpp \ - functions/FnGetText_.cpp \ - functions/FnJSEscape.cpp \ - functions/FnDefined.cpp \ - functions/FnSprintf.cpp \ - functions/FnHrefParam.cpp \ - functions/FnCast.cpp \ - functions/FnJSON.cpp \ - functions/FnRandom.cpp \ - functions/FnLog.cpp \ - functions/FnObjDump.cpp \ - functions/FnMBTruncate.cpp \ - functions/FnDefault.cpp \ - functions/FnNumeral.cpp \ - functions/FnAvg.cpp \ - functions/FnEmitter.cpp \ - functions/FnError.cpp \ - functions/FnHashElement.cpp \ - functions/FnArrayElement.cpp \ - CTPP2VMDumper.cpp \ - CTPP2JSONParser.cpp \ - CTPP2DTOA.cpp \ - CTPP2Util.cpp - -libctpp2_la_CXXFLAGS=-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -if IS_OSX -libctpp2_la_CXXFLAGS+= -I/opt/local/include -endif - -libctpp2_la_LDFLAGS= - -CLEANFILES=*.obj *.lib *.dll \ No newline at end of file diff --git a/src/ctype/Makefile.am.alt b/src/ctype/Makefile.am.alt deleted file mode 100644 index e69de29..0000000 diff --git a/src/ctype/Makefile.am.orig b/src/ctype/Makefile.am.orig deleted file mode 100644 index bb8f206..0000000 --- a/src/ctype/Makefile.am.orig +++ /dev/null @@ -1,7 +0,0 @@ -if IS_OSX -SUBDIRS = \ - zimAccessor -else -SUBDIRS = \ - zimAccessor -endif diff --git a/src/ctype/zimAccessor/Makefile.am.alt b/src/ctype/zimAccessor/Makefile.am.alt deleted file mode 100644 index e69de29..0000000 diff --git a/src/ctype/zimAccessor/Makefile.am.orig b/src/ctype/zimAccessor/Makefile.am.orig deleted file mode 100644 index 194b2dc..0000000 --- a/src/ctype/zimAccessor/Makefile.am.orig +++ /dev/null @@ -1,23 +0,0 @@ -pkglib_LTLIBRARIES=libZimAccessor.la -pkglibdir=$(libdir)/kiwix/components/ctype -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -libZimAccessor_la_SOURCES= \ - zimAccessor.cpp \ - zimAccessorWrapper.cpp \ - $(top_srcdir)/src/common/kiwix/reader.cpp \ - IZimAccessor.h \ - zimAccessorWrapper.h \ - $(top_srcdir)/src/common/kiwix/reader.h \ - $(top_srcdir)/src/common/pathTools.h \ - $(top_srcdir)/src/common/pathTools.cpp \ -libZimAccessor_la_CXXFLAGS=$(LIBZIM_CFLAGS) -I../../common/ -if IS_STATIC -libZimAccessor_la_LDFLAGS=$(LIBZIM_STATIC_LDFLAGS) $(LIBZIMSELF_STATIC_LDFLAGS) $(LIBLZMA_STATIC_LDFLAGS) -else -libZimAccessor_la_LDFLAGS=$(LIBZIM_LDFLAGS) -libZimAccessor_la_LIBADD=$(top_builddir)/src/zimlib/src/libzim.la -endif -if IS_OSX -libZimAccessor_la_LDFLAGS=$(LIBZIM_STATIC_LDFLAGS) $(LIBZIMSELF_STATIC_LDFLAGS) -endif -CLEANFILES=*.lib *.obj *.dll diff --git a/src/dependences/.mozconfig b/src/dependences/.mozconfig deleted file mode 100644 index 70d9e21..0000000 --- a/src/dependences/.mozconfig +++ /dev/null @@ -1,12 +0,0 @@ -# This file specifies the build flags for XULRunner. You can use it by adding: -# . $topsrcdir/xulrunner/config/mozconfig -# to the top of your mozconfig file. - -ac_add_options --enable-application=xulrunner -ac_add_options --disable-javaxpcom -ac_add_options --disable-shared -#ac_add_options --enable-libxul -#ac_add_options --enable-optimize -#ac_add_options --disable-tests -#ac_add_options --disable-crypto -#ac_add_options --disable-debug diff --git a/src/dependences/patches/xz-4.999.9beta-lzma-versioninfo.patch b/src/dependences/patches/xz-4.999.9beta-lzma-versioninfo.patch deleted file mode 100644 index 1f9b976..0000000 --- a/src/dependences/patches/xz-4.999.9beta-lzma-versioninfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/liblzma/Makefile.am -=================================================================== ---- src/liblzma/Makefile.am (revision 1) -+++ src/liblzma/Makefile.am (working copy) -@@ -24,7 +24,7 @@ - -I$(top_srcdir)/src/liblzma/delta \ - -I$(top_srcdir)/src/liblzma/simple \ - -I$(top_srcdir)/src/common --liblzma_la_LDFLAGS = -no-undefined -version-info 0:0:0 -+liblzma_la_LDFLAGS = -no-undefined -version-info 1:0:0 - - include $(srcdir)/common/Makefile.inc - include $(srcdir)/check/Makefile.inc diff --git a/src/dependences/patches/xz-4.999.9beta-sysctl-darwin.patch b/src/dependences/patches/xz-4.999.9beta-sysctl-darwin.patch deleted file mode 100644 index 5f3b8e9..0000000 --- a/src/dependences/patches/xz-4.999.9beta-sysctl-darwin.patch +++ /dev/null @@ -1,62 +0,0 @@ -commit 27414daadf5727e8ab942374b5ec1c8990122878 -Author: Lasse Collin -Date: Sat Aug 29 13:39:21 2009 +0300 - - Fix sysctl() usage. - - This fixes build on *BSDs and Darwin. - - Thanks to Jukka Salmi for the patches. - Richard Koch reported the problem too. -diff --git a/m4/lc_cpucores.m4 b/m4/lc_cpucores.m4 -index 2fae953..52f7c98 100644 ---- m4/lc_cpucores.m4 -+++ m4/lc_cpucores.m4 -@@ -43,7 +43,7 @@ main(void) - int name[2] = { CTL_HW, HW_NCPU }; - int cpus; - size_t cpus_size = sizeof(cpus); -- sysctl(name, 2, &cpus, &cpus_size, NULL, NULL); -+ sysctl(name, 2, &cpus, &cpus_size, NULL, 0); - return 0; - } - ]])], [ -diff --git a/m4/lc_physmem.m4 b/m4/lc_physmem.m4 -index 78be136..5d9581e 100644 ---- m4/lc_physmem.m4 -+++ m4/lc_physmem.m4 -@@ -45,7 +45,7 @@ main(void) - int name[2] = { CTL_HW, HW_PHYSMEM }; - unsigned long mem; - size_t mem_ptr_size = sizeof(mem); -- sysctl(name, 2, &mem, &mem_ptr_size, NULL, NULL); -+ sysctl(name, 2, &mem, &mem_ptr_size, NULL, 0); - return 0; - } - ]])], [ -diff --git a/src/common/cpucores.h b/src/common/cpucores.h -index 704d8a2..330cd9c 100644 ---- src/common/cpucores.h -+++ src/common/cpucores.h -@@ -40,7 +40,7 @@ cpucores(void) - int name[2] = { CTL_HW, HW_NCPU }; - int cpus; - size_t cpus_size = sizeof(cpus); -- if (!sysctl(name, &cpus, &cpus_size, NULL, NULL) -+ if (!sysctl(name, 2, &cpus, &cpus_size, NULL, 0) - && cpus_size == sizeof(cpus) && cpus > 0) - ret = (uint32_t)(cpus); - #endif -diff --git a/src/common/physmem.h b/src/common/physmem.h -index 63482c6..0dc77e9 100644 ---- src/common/physmem.h -+++ src/common/physmem.h -@@ -104,7 +104,7 @@ physmem(void) - uint64_t u64; - } mem; - size_t mem_ptr_size = sizeof(mem.u64); -- if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, NULL)) { -+ if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, 0)) { - // IIRC, 64-bit "return value" is possible on some 64-bit - // BSD systems even with HW_PHYSMEM (instead of HW_PHYSMEM64), - // so support both. diff --git a/src/indexer/Makefile.am.alt b/src/indexer/Makefile.am.alt deleted file mode 100644 index 8c1620a..0000000 --- a/src/indexer/Makefile.am.alt +++ /dev/null @@ -1,28 +0,0 @@ -bin_PROGRAMS=kiwix-index -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/ctpp2/include -kiwix_index_SOURCES= \ - kiwix-index.cpp \ - ../common/kiwix/xapian/myhtmlparse.cc \ - ../common/kiwix/xapian/htmlparse.cc \ - ../common/unaccent.cpp \ - ../common/kiwix/indexer.cpp \ - ../common/kiwix/reader.cpp \ - ../common/kiwix/xapianIndexer.cpp \ - ../common/kiwix/cluceneIndexer.cpp \ - ../common/kiwix/xapian/myhtmlparse.h \ - ../common/kiwix/xapian/namedentities.h \ - ../common/kiwix/xapian/htmlparse.h \ - ../common/unaccent.h \ - ../common/kiwix/indexer.h \ - ../common/kiwix/reader.h \ - ../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=$(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) $(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/indexer/Makefile.am.orig b/src/indexer/Makefile.am.orig deleted file mode 100644 index cf41a41..0000000 --- a/src/indexer/Makefile.am.orig +++ /dev/null @@ -1,23 +0,0 @@ -bin_PROGRAMS=kiwix-index -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/ctpp2/include -kiwix_index_SOURCES= \ - kiwix-index.cpp \ - ../common/kiwix/xapian/myhtmlparse.cc \ - ../common/kiwix/xapian/htmlparse.cc \ - ../common/unaccent.cpp \ - ../common/kiwix/indexer.cpp \ - ../common/kiwix/reader.cpp \ - ../common/kiwix/xapianIndexer.cpp \ - ../common/kiwix/cluceneIndexer.cpp -include_HEADERS= \ - ../common/kiwix/xapian/myhtmlparse.h \ - ../common/kiwix/xapian/namedentities.h \ - ../common/kiwix/xapian/htmlparse.h \ - ../common/unaccent.h \ - ../common/kiwix/indexer.h \ - ../common/kiwix/reader.h \ - ../common/kiwix/xapianIndexer.h \ - ../common/kiwix/cluceneIndexer.h -kiwix_index_CXXFLAGS=$(LIBXAPIAN_CFLAGS) $(LIBCLUCENE_CFLAGS) $(LIBICU_CFLAGS) $(LIBZIM_CFLAGS) -I../common/ -kiwix_index_LDFLAGS=$(LIBXAPIAN_LDFLAGS) $(LIBCLUCENE_LDFLAGS) $(LIBICU_LDFLAGS) $(LIBZIM_LDFLAGS) -kiwix_index_LDADD=../zimlib/src/.libs/libzim.a diff --git a/src/installer/Makefile.am.alt b/src/installer/Makefile.am.alt deleted file mode 100644 index ca57b6d..0000000 --- a/src/installer/Makefile.am.alt +++ /dev/null @@ -1,38 +0,0 @@ -bin_PROGRAMS=kiwix-install -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/pugixml -kiwix_install_SOURCES= \ - kiwix-install.cpp \ - ../common/kiwix/xapian/myhtmlparse.cc \ - ../common/kiwix/xapian/htmlparse.cc \ - ../common/kiwix/xapianIndexer.cpp \ - ../common/kiwix/cluceneIndexer.cpp \ - ../common/unaccent.cpp \ - ../common/base64.cpp \ - ../common/kiwix/indexer.cpp \ - ../common/kiwix/reader.cpp \ - ../common/kiwix/library.cpp \ - ../common/kiwix/manager.cpp \ - ../common/regexTools.cpp \ - ../common/pathTools.cpp \ - ../common/kiwix/xapian/myhtmlparse.h \ - ../common/kiwix/xapian/namedentities.h \ - ../common/kiwix/xapian/htmlparse.h \ - ../common/kiwix/xapianIndexer.h \ - ../common/kiwix/cluceneIndexer.h \ - ../common/unaccent.h \ - ../common/base64.h \ - ../common/kiwix/indexer.h \ - ../common/kiwix/reader.h \ - ../common/kiwix/library.h \ - ../common/kiwix/manager.h \ - ../common/regexTools.h \ - ../common/pathTools.h -kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CLAGS) $(UUID_CFLAGS) -I../common/ - -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) $(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/installer/Makefile.am.orig b/src/installer/Makefile.am.orig deleted file mode 100644 index 2dbcc47..0000000 --- a/src/installer/Makefile.am.orig +++ /dev/null @@ -1,33 +0,0 @@ -bin_PROGRAMS=kiwix-install -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/pugixml -kiwix_install_SOURCES= \ - kiwix-install.cpp \ - ../common/kiwix/xapian/myhtmlparse.cc \ - ../common/kiwix/xapian/htmlparse.cc \ - ../common/kiwix/xapianIndexer.cpp \ - ../common/kiwix/cluceneIndexer.cpp \ - ../common/unaccent.cpp \ - ../common/base64.cpp \ - ../common/kiwix/indexer.cpp \ - ../common/kiwix/reader.cpp \ - ../common/kiwix/library.cpp \ - ../common/kiwix/manager.cpp \ - ../common/regexTools.cpp \ - ../common/pathTools.cpp -include_HEADERS= \ - ../common/kiwix/xapian/myhtmlparse.h \ - ../common/kiwix/xapian/namedentities.h \ - ../common/kiwix/xapian/htmlparse.h \ - ../common/kiwix/xapianIndexer.h \ - ../common/kiwix/cluceneIndexer.h \ - ../common/unaccent.h \ - ../common/base64.h \ - ../common/kiwix/indexer.h \ - ../common/kiwix/reader.h \ - ../common/kiwix/library.h \ - ../common/kiwix/manager.h \ - ../common/regexTools.h \ - ../common/pathTools.h -kiwix_install_CXXFLAGS=$(LIBXAPIAN_CFLAGS) $(LIBCLUCENE_CFLAGS) $(LIBICU_CFLAGS) $(LIBPUGIXML_CFLAGS) -I../common/ -kiwix_install_LDFLAGS=$(LIBXAPIAN_LDFLAGS) $(LIBCLUCENE_LDFLAGS) $(LIBICU_LDFLAGS) $(LIBPUGIXML_LDFLAGS) -kiwix_install_LDADD=../zimlib/src/libzim.la ../pugixml/libpugixml.la \ No newline at end of file diff --git a/src/manager/Makefile.am.alt b/src/manager/Makefile.am.alt deleted file mode 100644 index 3aef434..0000000 --- a/src/manager/Makefile.am.alt +++ /dev/null @@ -1,27 +0,0 @@ -bin_PROGRAMS=kiwix-manage -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/pugixml -kiwix_manage_SOURCES= \ - kiwix-manage.cpp \ - ../common/kiwix/manager.cpp \ - ../common/kiwix/library.cpp \ - ../common/kiwix/reader.cpp \ - ../common/base64.cpp \ - ../common/regexTools.cpp \ - ../common/unaccent.cpp \ - ../common/pathTools.cpp \ - ../common/kiwix/manager.h \ - ../common/kiwix/library.h \ - ../common/kiwix/reader.h \ - ../common/base64.h \ - ../common/regexTools.h \ - ../common/unaccent.h \ - ../common/pathTools.h -kiwix_manage_CXXFLAGS=$(ZIMLIB_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/ - -kiwix_manage_LDFLAGS= $(CHECK_LDFLAGS) - -if STATIC_BINS -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/manager/Makefile.am.orig b/src/manager/Makefile.am.orig deleted file mode 100644 index d9cf1f9..0000000 --- a/src/manager/Makefile.am.orig +++ /dev/null @@ -1,29 +0,0 @@ -bin_PROGRAMS=kiwix-manage -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/pugixml -kiwix_manage_SOURCES= \ - kiwix-manage.cpp \ - ../common/kiwix/manager.cpp \ - ../common/kiwix/library.cpp \ - ../common/kiwix/reader.cpp \ - ../common/base64.cpp \ - ../common/regexTools.cpp \ - ../common/unaccent.cpp \ - ../common/pathTools.cpp -include_HEADERS= \ - ../common/kiwix/manager.h \ - ../common/kiwix/library.h \ - ../common/kiwix/reader.h \ - ../common/base64.h \ - ../common/regexTools.h \ - ../common/unaccent.h \ - ../common/pathTools.h -kiwix_manage_CXXFLAGS=$(LIBZIM_CFLAGS) $(LIBICU_CFLAGS) -I../common/ -if IS_STATIC -kiwix_manage_LDFLAGS=$(LIBZIM_STATIC_LDFLAGS) $(LIBICU_STATIC_LDFLAGS) -else -kiwix_manage_LDFLAGS=$(LIBZIM_LDFLAGS) $(LIBICU_LDFLAGS) -kiwix_manage_LDADD=../zimlib/src/libzim.la ../pugixml/libpugixml.la -endif -if IS_OSX -kiwix_manage_LDFLAGS=$(LIBZIM_STATIC_LDFLAGS) $(LIBICU_STATIC_LDFLAGS) -endif diff --git a/src/pugixml/Makefile.am.alt b/src/pugixml/Makefile.am.alt deleted file mode 100644 index 0413e80..0000000 --- a/src/pugixml/Makefile.am.alt +++ /dev/null @@ -1,13 +0,0 @@ -AM_CPPFLAGS= - -noinst_LTLIBRARIES = libpugixml.la - -libpugixml_la_SOURCES = \ - pugixml.cpp \ - pugixml.hpp \ - pugiconfig.hpp - -libpugixml_la_CXXFLAGS=-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -libpugixml_la_LDFLAGS=$(CHECK_LDFLAGS) - -CLEANFILES=*.obj *.lib *.dll \ No newline at end of file diff --git a/src/pugixml/Makefile.am.orig b/src/pugixml/Makefile.am.orig deleted file mode 100644 index 5c749e7..0000000 --- a/src/pugixml/Makefile.am.orig +++ /dev/null @@ -1,13 +0,0 @@ -AM_CPPFLAGS= - -noinst_LTLIBRARIES = libpugixml.la - -libpugixml_la_SOURCES = \ - pugixml.cpp \ - pugixml.hpp \ - pugiconfig.hpp - -libpugixml_la_CXXFLAGS=-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -libpugixml_la_LDFLAGS= - -CLEANFILES=*.obj *.lib *.dll \ No newline at end of file diff --git a/src/reader/Makefile.am.alt b/src/reader/Makefile.am.alt deleted file mode 100644 index 9489644..0000000 --- a/src/reader/Makefile.am.alt +++ /dev/null @@ -1,15 +0,0 @@ -bin_PROGRAMS=kiwix-read -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -kiwix_read_SOURCES= \ - kiwix-read.cpp \ - ../common/kiwix/reader.cpp \ - ../common/kiwix/reader.h -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) $(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/reader/Makefile.am.orig b/src/reader/Makefile.am.orig deleted file mode 100644 index 4893afe..0000000 --- a/src/reader/Makefile.am.orig +++ /dev/null @@ -1,14 +0,0 @@ -bin_PROGRAMS=kiwix-read -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -kiwix_read_SOURCES= \ - kiwix-read.cpp \ - ../common/kiwix/reader.cpp -include_HEADERS= \ - ../common/kiwix/reader.h -kiwix_read_CXXFLAGS=$(LIBZIM_CFLAGS) -I../common/ -if IS_STATIC -kiwix_read_LDFLAGS=$(LIBZIM_STATIC_LDFLAGS) $(LIBZIMSELF_STATIC_LDFLAGS) $(LIBLZMA_STATIC_LDFLAGS) -else -kiwix_read_LDFLAGS=$(LIBZIM_LDFLAGS) -kiwix_read_LDADD=$(top_builddir)/src/zimlib/src/libzim.la -endif diff --git a/src/searcher/Makefile.am.alt b/src/searcher/Makefile.am.alt deleted file mode 100644 index 1367204..0000000 --- a/src/searcher/Makefile.am.alt +++ /dev/null @@ -1,29 +0,0 @@ -bin_PROGRAMS=kiwix-search -AM_CPPFLAGS=-I$(top_srcdir)/src/common -kiwix_search_SOURCES= \ - kiwix-search.cpp \ - ../common/unaccent.cpp \ - ../common/resourceTools.cpp \ - ../common/stringTools.cpp \ - ../common/kiwix/searcher.cpp \ - ../common/kiwix/xapianSearcher.cpp \ - ../common/kiwix/cluceneSearcher.cpp \ - ../common/unaccent.h \ - ../common/kiwix/searcher.h \ - ../common/resourceTools.h \ - ../common/stringTools.h \ - ../common/kiwix/xapianSearcher.h \ - ../common/kiwix/cluceneSearcher.h -kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) $(ZLIB_CFLAGS) $(UUID_CFLAGS) -I../common/ - -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) $(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 - -if IS_OSX -kiwix_search_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation -endif diff --git a/src/searcher/Makefile.am.orig b/src/searcher/Makefile.am.orig deleted file mode 100644 index e199514..0000000 --- a/src/searcher/Makefile.am.orig +++ /dev/null @@ -1,20 +0,0 @@ -bin_PROGRAMS=kiwix-search -AM_CPPFLAGS=-I$(top_srcdir)/src/common -kiwix_search_SOURCES= \ - kiwix-search.cpp \ - ../common/unaccent.cpp \ - ../common/resourceTools.cpp \ - ../common/kiwix/searcher.cpp \ - ../common/kiwix/xapianSearcher.cpp \ - ../common/kiwix/cluceneSearcher.cpp \ - ../common/stringTools.cpp -include_HEADERS= \ - ../common/unaccent.h \ - ../common/resourceTools.h \ - ../common/kiwix/searcher.h \ - ../common/kiwix/xapianSearcher.h \ - ../common/kiwix/cluceneSearcher.h \ - ../common/stringTools.h -kiwix_search_CXXFLAGS=$(LIBXAPIAN_CFLAGS) $(LIBCLUCENE_CFLAGS) $(LIBICU_CFLAGS) $(LIBCTPP2_CFLAGS) -I../common/ -kiwix_search_LDFLAGS=$(LIBXAPIAN_LDFLAGS) $(LIBCLUCENE_LDFLAGS) $(LIBICU_LDFLAGS) $(LIBCTPP2_LDFLAGS) -kiwix_search_LDADD=../ctpp2/src/.libs/libctpp2.a diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt deleted file mode 100644 index 000e6e2..0000000 --- a/src/server/Makefile.am.alt +++ /dev/null @@ -1,41 +0,0 @@ -bin_PROGRAMS=kiwix-serve -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/ctpp2/include -I$(top_srcdir)/src/pugixml -kiwix_serve_SOURCES= \ - kiwix-serve.cpp \ - ../common/kiwix/reader.cpp \ - ../common/kiwix/searcher.cpp \ - ../common/kiwix/manager.cpp \ - ../common/kiwix/library.cpp \ - ../common/kiwix/xapianSearcher.cpp \ - ../common/kiwix/cluceneSearcher.cpp \ - ../common/unaccent.cpp \ - ../common/base64.cpp \ - ../common/pathTools.cpp \ - ../common/regexTools.cpp \ - ../common/resourceTools.cpp \ - ../common/stringTools.cpp \ - ../common/kiwix/reader.h \ - ../common/kiwix/searcher.h \ - ../common/kiwix/manager.h \ - ../common/kiwix/library.h \ - ../common/kiwix/xapianSearcher.h \ - ../common/kiwix/cluceneSearcher.h \ - ../common/unaccent.h \ - ../common/base64.h \ - ../common/pathTools.h \ - ../common/regexTools.h \ - ../common/resourceTools.h \ - ../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_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) $(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 - -if IS_OSX -kiwix_serve_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation -endif diff --git a/src/server/Makefile.am.orig b/src/server/Makefile.am.orig deleted file mode 100644 index 5a29a2d..0000000 --- a/src/server/Makefile.am.orig +++ /dev/null @@ -1,36 +0,0 @@ -bin_PROGRAMS=kiwix-serve -AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/ctpp2/include -I$(top_srcdir)/src/pugixml -kiwix_serve_SOURCES= \ - kiwix-serve.cpp \ - ../common/kiwix/reader.cpp \ - ../common/kiwix/searcher.cpp \ - ../common/kiwix/manager.cpp \ - ../common/kiwix/library.cpp \ - ../common/kiwix/xapianSearcher.cpp \ - ../common/kiwix/cluceneSearcher.cpp \ - ../common/unaccent.cpp \ - ../common/base64.cpp \ - ../common/pathTools.cpp \ - ../common/regexTools.cpp \ - ../common/resourceTools.cpp \ - ../common/stringTools.cpp -include_HEADERS= \ - ../common/kiwix/reader.h \ - ../common/kiwix/searcher.h \ - ../common/kiwix/manager.h \ - ../common/kiwix/library.h \ - ../common/kiwix/xapianSearcher.h \ - ../common/kiwix/cluceneSearcher.h \ - ../common/unaccent.h \ - ../common/base64.h \ - ../common/pathTools.h \ - ../common/regexTools.h \ - ../common/resourceTools.h \ - ../common/stringTools.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) -else -kiwix_serve_LDFLAGS=${LIBMICROHTTPD_LDFLAGS} $(LIBPUGIXML_LDLAGS) $(LIBCTPP2_LDLAGS) $(LIBCLUCENE_LDFLAGS) $(LIBXAPIAN_LDFLAGS) $(LIBICU_LDFLAGS) $(LIBZIM_LDFLAGS) -endif -kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a diff --git a/src/zimlib/Makefile.am.alt b/src/zimlib/Makefile.am.alt deleted file mode 100644 index 6770d02..0000000 --- a/src/zimlib/Makefile.am.alt +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS=src -EXTRA_DIST=include \ No newline at end of file diff --git a/src/zimlib/Makefile.am.orig b/src/zimlib/Makefile.am.orig deleted file mode 100644 index ba43967..0000000 --- a/src/zimlib/Makefile.am.orig +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS=src -EXTRA_DIST=include diff --git a/src/zimlib/src/Makefile.am.alt b/src/zimlib/src/Makefile.am.alt deleted file mode 100644 index 93340f0..0000000 --- a/src/zimlib/src/Makefile.am.alt +++ /dev/null @@ -1,35 +0,0 @@ -AM_CPPFLAGS=-I$(top_srcdir)/src/zimlib/include - -noinst_LTLIBRARIES = libzim.la - -libzim_la_SOURCES = \ - article.cpp \ - articlesearch.cpp \ - cluster.cpp \ - dirent.cpp \ - file.cpp \ - fileheader.cpp \ - fileimpl.cpp \ - indexarticle.cpp \ - ptrstream.cpp \ - search.cpp \ - template.cpp \ - unicode.cpp \ - uuid.cpp \ - zintstream.cpp \ - envvalue.cpp \ - lzmastream.cpp \ - unlzmastream.cpp \ - fstream.cpp \ - md5.cpp \ - md5stream.cpp \ - ptrstream.h \ - log.h \ - envvalue.h \ - md5stream.h \ - md5.h - -libzim_la_CXXFLAGS=${LZMA_CFLAGS} -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -libzim_la_LDFLAGS=$(CHECK_LDFLAGS) ${LZMA_STATIC_LDFLAGS} - -CLEANFILES=*.obj *.lib *.dll \ No newline at end of file diff --git a/src/zimlib/src/Makefile.am.orig b/src/zimlib/src/Makefile.am.orig deleted file mode 100644 index 937f9fd..0000000 --- a/src/zimlib/src/Makefile.am.orig +++ /dev/null @@ -1,35 +0,0 @@ -AM_CPPFLAGS=-I$(top_srcdir)/src/zimlib/include - -noinst_LTLIBRARIES = libzim.la - -libzim_la_SOURCES = \ - article.cpp \ - articlesearch.cpp \ - cluster.cpp \ - dirent.cpp \ - file.cpp \ - fileheader.cpp \ - fileimpl.cpp \ - indexarticle.cpp \ - ptrstream.cpp \ - search.cpp \ - template.cpp \ - unicode.cpp \ - uuid.cpp \ - zintstream.cpp \ - envvalue.cpp \ - lzmastream.cpp \ - unlzmastream.cpp \ - fstream.cpp \ - md5.cpp \ - md5stream.cpp \ - ptrstream.h \ - log.h \ - envvalue.h \ - md5stream.h \ - md5.h - -libzim_la_CXXFLAGS=${LIBLZMA_CFLAGS} -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -libzim_la_LDFLAGS=${LIBLZMA_LDFLAGS} - -CLEANFILES=*.obj *.lib *.dll \ No newline at end of file diff --git a/static/Makefile.am.alt b/static/Makefile.am.alt deleted file mode 100644 index ba37b01..0000000 --- a/static/Makefile.am.alt +++ /dev/null @@ -1,2 +0,0 @@ -# templatedir=$(pkgdatadir)/static -# template_DATA=results.tmpl \ No newline at end of file diff --git a/static/Makefile.am.orig b/static/Makefile.am.orig deleted file mode 100644 index f4d1924..0000000 --- a/static/Makefile.am.orig +++ /dev/null @@ -1,2 +0,0 @@ -templatedir=$(pkgdatadir)/static -template_DATA=results.tmpl