From cc15a18af49bb30d2086f688c80d5a11c43f8194 Mon Sep 17 00:00:00 2001 From: Teus Benschop Date: Sun, 21 Jan 2024 17:19:03 +0100 Subject: [PATCH] Updated webroot contents https://github.com/bibledit/cloud/issues/920 --- Makefile.am | 10 +- Makefile.in | 568 +-------------------------------------------------- config.h | 8 +- config.h.in | 3 - configure | 103 ---------- configure.ac | 2 - 6 files changed, 11 insertions(+), 683 deletions(-) diff --git a/Makefile.am b/Makefile.am index a563c6c8e..ab1fd6dde 100644 --- a/Makefile.am +++ b/Makefile.am @@ -513,7 +513,7 @@ libbibledit_a_SOURCES = \ tidy/tmbstr.c \ tidy/utf8.c -bin_PROGRAMS = server unittest generate +bin_PROGRAMS = server generate server_SOURCES = executable/bibledit.cpp @@ -635,11 +635,7 @@ AM_CXXFLAGS += $(GTK_CFLAGS) AM_CXXFLAGS += $(WEBKIT2GTK_CFLAGS) AM_CXXFLAGS += $(ICU_CFLAGS) AM_CXXFLAGS += $(XML2_CFLAGS) -AM_CXXFLAGS += $(UTF8PROC_CFLAGS) -AM_CXXFLAGS += $(GUMBO_CFLAGS) # AM_CXXFLAGS += $(TIDY_CFLAGS) -I/usr/include/tidy -AM_CXXFLAGS += $(PUGIXML_CFLAGS) -AM_CXXFLAGS += $(GTEST_CFLAGS) if MACFLAGS # Building Bibledit for macOS for two architectures @@ -657,11 +653,7 @@ LIBS += $(GTK_LIBS) LIBS += $(WEBKIT2GTK_LIBS) LIBS += $(ICU_LIBS) LIBS += $(XML2_LIBS) -LIBS += $(UTF8PROC_LIBS) -LIBS += $(GUMBO_LIBS) # LIBS += $(TIDY_LIBS) -LIBS += $(PUGIXML_LIBS) -LIBS += $(GTEST_LIBS) # The core library compiles and embeds the mbedtls library. # On Debian this gives a lintian error: diff --git a/Makefile.in b/Makefile.in index f41f85958..bd8173506 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,10 +88,11 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ -bin_PROGRAMS = server$(EXEEXT) unittest$(EXEEXT) generate$(EXEEXT) +bin_PROGRAMS = server$(EXEEXT) generate$(EXEEXT) @COMPILERWARNINGS_TRUE@am__append_1 = -Wall -Wno-unknown-pragmas -Wextra -pedantic -Wno-pragmas @COMPILERWARNINGS_TRUE@am__append_2 = -Wall -Wno-unknown-pragmas -Wextra -pedantic -Wshadow -Warray-bounds -Wcast-align -Wcast-qual -Wconversion -Wctor-dtor-privacy -Wdelete-non-virtual-dtor -Weffc++ -Wextra-semi -Wfloat-equal -Wformat=2 -Wmissing-include-dirs -Wmissing-noreturn -Wnull-dereference -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wsign-promo -Wsuggest-override -Wswitch-default -Wswitch-enum -Wundef -Wuninitialized -Wunused-but-set-parameter -Wunused-macros -Wunused-parameter -Wvla -Wzero-as-null-pointer-constant -Wmismatched-tags @COMPILERGCC_TRUE@@COMPILERWARNINGS_TRUE@am__append_3 = -Wcatch-value=2 -Wconditionally-supported -Wduplicated-branches -Wduplicated-cond -Wformat-overflow=2 -Wlogical-op -Wnoexcept -Wno-non-template-friend -Wrestrict -Wstrict-null-sentinel -Wuseless-cast -Wcomma-subscript -Wredundant-tags -Wvolatile +# AM_CXXFLAGS += $(TIDY_CFLAGS) -I/usr/include/tidy # Building Bibledit for macOS for two architectures # due to the switch from macOS from the x86_64 to the arm64 architecture. @@ -399,54 +400,6 @@ generate_DEPENDENCIES = libbibledit.a am_server_OBJECTS = executable/bibledit.$(OBJEXT) server_OBJECTS = $(am_server_OBJECTS) server_DEPENDENCIES = libbibledit.a -am_unittest_OBJECTS = unittests/unittest.$(OBJEXT) \ - unittests/utilities.$(OBJEXT) unittests/sqlite.$(OBJEXT) \ - unittests/session.$(OBJEXT) unittests/folders.$(OBJEXT) \ - unittests/flate.$(OBJEXT) unittests/checksum.$(OBJEXT) \ - unittests/bibles.$(OBJEXT) unittests/html2usfm.$(OBJEXT) \ - unittests/usfm2html.$(OBJEXT) \ - unittests/usfm2html2usfm.$(OBJEXT) \ - unittests/workspaces.$(OBJEXT) unittests/client.$(OBJEXT) \ - unittests/sentences.$(OBJEXT) \ - unittests/versification.$(OBJEXT) unittests/usfm.$(OBJEXT) \ - unittests/verses.$(OBJEXT) unittests/pairs.$(OBJEXT) \ - unittests/paratext.$(OBJEXT) unittests/hyphenate.$(OBJEXT) \ - unittests/search.$(OBJEXT) unittests/json.$(OBJEXT) \ - unittests/related.$(OBJEXT) unittests/editone.$(OBJEXT) \ - unittests/http.$(OBJEXT) unittests/memory.$(OBJEXT) \ - unittests/tasks.$(OBJEXT) unittests/biblegateway.$(OBJEXT) \ - unittests/rss.$(OBJEXT) unittests/space.$(OBJEXT) \ - unittests/roles.$(OBJEXT) unittests/md5.$(OBJEXT) \ - unittests/string.$(OBJEXT) unittests/users.$(OBJEXT) \ - unittests/date.$(OBJEXT) unittests/export.$(OBJEXT) \ - unittests/html.$(OBJEXT) unittests/archive.$(OBJEXT) \ - unittests/odf.$(OBJEXT) unittests/text.$(OBJEXT) \ - unittests/url.$(OBJEXT) unittests/passage.$(OBJEXT) \ - unittests/styles.$(OBJEXT) unittests/diff.$(OBJEXT) \ - unittests/git.$(OBJEXT) unittests/ipc.$(OBJEXT) \ - unittests/shell.$(OBJEXT) unittests/ldap.$(OBJEXT) \ - unittests/dev.$(OBJEXT) unittests/sample.$(OBJEXT) \ - unittests/config.$(OBJEXT) unittests/log.$(OBJEXT) \ - unittests/books.$(OBJEXT) unittests/check.$(OBJEXT) \ - unittests/localization.$(OBJEXT) unittests/confirm.$(OBJEXT) \ - unittests/jobs.$(OBJEXT) unittests/kjv.$(OBJEXT) \ - unittests/oshb.$(OBJEXT) unittests/sblgnt.$(OBJEXT) \ - unittests/sprint.$(OBJEXT) unittests/mail.$(OBJEXT) \ - unittests/navigation.$(OBJEXT) unittests/resources.$(OBJEXT) \ - unittests/notes.$(OBJEXT) unittests/modifications.$(OBJEXT) \ - unittests/volatile.$(OBJEXT) unittests/state.$(OBJEXT) \ - unittests/strong.$(OBJEXT) unittests/morphgnt.$(OBJEXT) \ - unittests/etcbc4.$(OBJEXT) unittests/lexicon.$(OBJEXT) \ - unittests/cache.$(OBJEXT) unittests/login.$(OBJEXT) \ - unittests/privileges.$(OBJEXT) unittests/statistics.$(OBJEXT) \ - unittests/webview.$(OBJEXT) unittests/javascript.$(OBJEXT) \ - unittests/french.$(OBJEXT) unittests/merge.$(OBJEXT) \ - unittests/nmt.$(OBJEXT) unittests/html2format.$(OBJEXT) \ - unittests/studylight.$(OBJEXT) unittests/gbs.$(OBJEXT) \ - unittests/bibleimages.$(OBJEXT) unittests/image.$(OBJEXT) \ - unittests/easyenglishbible.$(OBJEXT) -unittest_OBJECTS = $(am_unittest_OBJECTS) -unittest_DEPENDENCIES = libbibledit.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -747,60 +700,8 @@ am__depfiles_remade = access/$(DEPDIR)/bible.Po \ tidy/$(DEPDIR)/tidylib.Po tidy/$(DEPDIR)/tmbstr.Po \ tidy/$(DEPDIR)/utf8.Po timer/$(DEPDIR)/index.Po \ tmp/$(DEPDIR)/tmp.Po trash/$(DEPDIR)/handler.Po \ - unittests/$(DEPDIR)/archive.Po \ - unittests/$(DEPDIR)/biblegateway.Po \ - unittests/$(DEPDIR)/bibleimages.Po \ - unittests/$(DEPDIR)/bibles.Po unittests/$(DEPDIR)/books.Po \ - unittests/$(DEPDIR)/cache.Po unittests/$(DEPDIR)/check.Po \ - unittests/$(DEPDIR)/checksum.Po unittests/$(DEPDIR)/client.Po \ - unittests/$(DEPDIR)/config.Po unittests/$(DEPDIR)/confirm.Po \ - unittests/$(DEPDIR)/date.Po unittests/$(DEPDIR)/dev.Po \ - unittests/$(DEPDIR)/diff.Po \ - unittests/$(DEPDIR)/easyenglishbible.Po \ - unittests/$(DEPDIR)/editone.Po unittests/$(DEPDIR)/etcbc4.Po \ - unittests/$(DEPDIR)/export.Po unittests/$(DEPDIR)/flate.Po \ - unittests/$(DEPDIR)/folders.Po unittests/$(DEPDIR)/french.Po \ - unittests/$(DEPDIR)/gbs.Po unittests/$(DEPDIR)/git.Po \ - unittests/$(DEPDIR)/html.Po unittests/$(DEPDIR)/html2format.Po \ - unittests/$(DEPDIR)/html2usfm.Po unittests/$(DEPDIR)/http.Po \ - unittests/$(DEPDIR)/hyphenate.Po unittests/$(DEPDIR)/image.Po \ - unittests/$(DEPDIR)/ipc.Po unittests/$(DEPDIR)/javascript.Po \ - unittests/$(DEPDIR)/jobs.Po unittests/$(DEPDIR)/json.Po \ - unittests/$(DEPDIR)/kjv.Po unittests/$(DEPDIR)/ldap.Po \ - unittests/$(DEPDIR)/lexicon.Po \ - unittests/$(DEPDIR)/localization.Po unittests/$(DEPDIR)/log.Po \ - unittests/$(DEPDIR)/login.Po unittests/$(DEPDIR)/mail.Po \ - unittests/$(DEPDIR)/md5.Po unittests/$(DEPDIR)/memory.Po \ - unittests/$(DEPDIR)/merge.Po \ - unittests/$(DEPDIR)/modifications.Po \ - unittests/$(DEPDIR)/morphgnt.Po \ - unittests/$(DEPDIR)/navigation.Po unittests/$(DEPDIR)/nmt.Po \ - unittests/$(DEPDIR)/notes.Po unittests/$(DEPDIR)/odf.Po \ - unittests/$(DEPDIR)/oshb.Po unittests/$(DEPDIR)/pairs.Po \ - unittests/$(DEPDIR)/paratext.Po unittests/$(DEPDIR)/passage.Po \ - unittests/$(DEPDIR)/privileges.Po \ - unittests/$(DEPDIR)/related.Po \ - unittests/$(DEPDIR)/resources.Po unittests/$(DEPDIR)/roles.Po \ - unittests/$(DEPDIR)/rss.Po unittests/$(DEPDIR)/sample.Po \ - unittests/$(DEPDIR)/sblgnt.Po unittests/$(DEPDIR)/search.Po \ - unittests/$(DEPDIR)/sentences.Po \ - unittests/$(DEPDIR)/session.Po unittests/$(DEPDIR)/shell.Po \ - unittests/$(DEPDIR)/space.Po unittests/$(DEPDIR)/sprint.Po \ - unittests/$(DEPDIR)/sqlite.Po unittests/$(DEPDIR)/state.Po \ - unittests/$(DEPDIR)/statistics.Po \ - unittests/$(DEPDIR)/string.Po unittests/$(DEPDIR)/strong.Po \ - unittests/$(DEPDIR)/studylight.Po \ - unittests/$(DEPDIR)/styles.Po unittests/$(DEPDIR)/tasks.Po \ - unittests/$(DEPDIR)/text.Po unittests/$(DEPDIR)/unittest.Po \ - unittests/$(DEPDIR)/url.Po unittests/$(DEPDIR)/users.Po \ - unittests/$(DEPDIR)/usfm.Po unittests/$(DEPDIR)/usfm2html.Po \ - unittests/$(DEPDIR)/usfm2html2usfm.Po \ - unittests/$(DEPDIR)/utilities.Po unittests/$(DEPDIR)/verses.Po \ - unittests/$(DEPDIR)/versification.Po \ - unittests/$(DEPDIR)/volatile.Po unittests/$(DEPDIR)/webview.Po \ - unittests/$(DEPDIR)/workspaces.Po user/$(DEPDIR)/account.Po \ - user/$(DEPDIR)/logic.Po user/$(DEPDIR)/notifications.Po \ - utf8proc/$(DEPDIR)/utf8proc.Po \ + user/$(DEPDIR)/account.Po user/$(DEPDIR)/logic.Po \ + user/$(DEPDIR)/notifications.Po utf8proc/$(DEPDIR)/utf8proc.Po \ versification/$(DEPDIR)/index.Po \ versification/$(DEPDIR)/logic.Po \ versification/$(DEPDIR)/system.Po webbb/$(DEPDIR)/search.Po \ @@ -835,9 +736,9 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = SOURCES = $(libbibledit_a_SOURCES) $(generate_SOURCES) \ - $(server_SOURCES) $(unittest_SOURCES) + $(server_SOURCES) DIST_SOURCES = $(libbibledit_a_SOURCES) $(generate_SOURCES) \ - $(server_SOURCES) $(unittest_SOURCES) + $(server_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -959,11 +860,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -# LIBS += $(TIDY_LIBS) LIBS = -Wall -lpthread -L. -g -rdynamic -ldl $(CURL_LIBS) \ $(OPENSSL_LIBS) $(GTK_LIBS) $(WEBKIT2GTK_LIBS) $(ICU_LIBS) \ - $(XML2_LIBS) $(UTF8PROC_LIBS) $(GUMBO_LIBS) $(PUGIXML_LIBS) \ - $(GTEST_LIBS) + $(XML2_LIBS) LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -1654,12 +1553,11 @@ generate_SOURCES = \ generate_LDADD = libbibledit.a AM_CFLAGS = -g $(OPENSSL_CFLAGS) $(am__append_1) $(am__append_5) -# AM_CXXFLAGS += $(TIDY_CFLAGS) -I/usr/include/tidy AM_CXXFLAGS = -fno-var-tracking -g $(am__append_2) $(am__append_3) \ $(CURL_CFLAGS) $(OPENSSL_CFLAGS) $(GTK_CFLAGS) \ $(WEBKIT2GTK_CFLAGS) $(ICU_CFLAGS) $(XML2_CFLAGS) \ - $(UTF8PROC_CFLAGS) $(GUMBO_CFLAGS) $(PUGIXML_CFLAGS) \ - $(GTEST_CFLAGS) $(am__append_4) + $(am__append_4) +# LIBS += $(TIDY_LIBS) # The core library compiles and embeds the mbedtls library. # On Debian this gives a lintian error: @@ -3366,190 +3264,6 @@ executable/bibledit.$(OBJEXT): executable/$(am__dirstamp) \ server$(EXEEXT): $(server_OBJECTS) $(server_DEPENDENCIES) $(EXTRA_server_DEPENDENCIES) @rm -f server$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(server_OBJECTS) $(server_LDADD) $(LIBS) -unittests/$(am__dirstamp): - @$(MKDIR_P) unittests - @: > unittests/$(am__dirstamp) -unittests/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) unittests/$(DEPDIR) - @: > unittests/$(DEPDIR)/$(am__dirstamp) -unittests/unittest.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/utilities.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/sqlite.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/session.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/folders.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/flate.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/checksum.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/bibles.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/html2usfm.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/usfm2html.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/usfm2html2usfm.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/workspaces.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/client.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/sentences.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/versification.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/usfm.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/verses.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/pairs.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/paratext.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/hyphenate.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/search.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/json.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/related.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/editone.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/http.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/memory.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/tasks.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/biblegateway.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/rss.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/space.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/roles.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/md5.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/string.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/users.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/date.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/export.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/html.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/archive.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/odf.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/text.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/url.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/passage.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/styles.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/diff.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/git.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/ipc.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/shell.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/ldap.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/dev.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/sample.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/config.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/log.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/books.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/check.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/localization.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/confirm.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/jobs.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/kjv.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/oshb.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/sblgnt.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/sprint.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/mail.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/navigation.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/resources.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/notes.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/modifications.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/volatile.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/state.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/strong.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/morphgnt.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/etcbc4.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/lexicon.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/cache.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/login.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/privileges.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/statistics.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/webview.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/javascript.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/french.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/merge.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/nmt.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/html2format.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/studylight.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/gbs.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/bibleimages.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/image.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) -unittests/easyenglishbible.$(OBJEXT): unittests/$(am__dirstamp) \ - unittests/$(DEPDIR)/$(am__dirstamp) - -unittest$(EXEEXT): $(unittest_OBJECTS) $(unittest_DEPENDENCIES) $(EXTRA_unittest_DEPENDENCIES) - @rm -f unittest$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(unittest_OBJECTS) $(unittest_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -3641,7 +3355,6 @@ mostlyclean-compile: -rm -f timer/*.$(OBJEXT) -rm -f tmp/*.$(OBJEXT) -rm -f trash/*.$(OBJEXT) - -rm -f unittests/*.$(OBJEXT) -rm -f user/*.$(OBJEXT) -rm -f utf8proc/*.$(OBJEXT) -rm -f versification/*.$(OBJEXT) @@ -4151,93 +3864,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@timer/$(DEPDIR)/index.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@tmp/$(DEPDIR)/tmp.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@trash/$(DEPDIR)/handler.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/archive.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/biblegateway.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/bibleimages.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/bibles.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/books.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/cache.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/check.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/checksum.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/client.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/config.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/confirm.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/date.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/dev.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/diff.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/easyenglishbible.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/editone.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/etcbc4.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/export.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/flate.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/folders.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/french.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/gbs.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/git.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/html.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/html2format.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/html2usfm.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/http.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/hyphenate.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/image.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/ipc.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/javascript.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/jobs.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/json.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/kjv.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/ldap.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/lexicon.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/localization.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/log.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/login.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/mail.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/md5.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/memory.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/merge.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/modifications.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/morphgnt.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/navigation.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/nmt.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/notes.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/odf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/oshb.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/pairs.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/paratext.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/passage.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/privileges.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/related.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/resources.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/roles.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/rss.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/sample.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/sblgnt.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/search.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/sentences.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/session.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/shell.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/space.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/sprint.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/sqlite.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/state.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/statistics.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/string.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/strong.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/studylight.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/styles.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/tasks.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/text.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/unittest.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/url.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/users.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/usfm.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/usfm2html.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/usfm2html2usfm.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/utilities.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/verses.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/versification.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/volatile.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/webview.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unittests/$(DEPDIR)/workspaces.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@user/$(DEPDIR)/account.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@user/$(DEPDIR)/logic.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@user/$(DEPDIR)/notifications.Po@am__quote@ # am--include-marker @@ -4794,8 +4420,6 @@ distclean-generic: -rm -f tmp/$(am__dirstamp) -rm -f trash/$(DEPDIR)/$(am__dirstamp) -rm -f trash/$(am__dirstamp) - -rm -f unittests/$(DEPDIR)/$(am__dirstamp) - -rm -f unittests/$(am__dirstamp) -rm -f user/$(DEPDIR)/$(am__dirstamp) -rm -f user/$(am__dirstamp) -rm -f utf8proc/$(DEPDIR)/$(am__dirstamp) @@ -5318,93 +4942,6 @@ distclean: distclean-am -rm -f timer/$(DEPDIR)/index.Po -rm -f tmp/$(DEPDIR)/tmp.Po -rm -f trash/$(DEPDIR)/handler.Po - -rm -f unittests/$(DEPDIR)/archive.Po - -rm -f unittests/$(DEPDIR)/biblegateway.Po - -rm -f unittests/$(DEPDIR)/bibleimages.Po - -rm -f unittests/$(DEPDIR)/bibles.Po - -rm -f unittests/$(DEPDIR)/books.Po - -rm -f unittests/$(DEPDIR)/cache.Po - -rm -f unittests/$(DEPDIR)/check.Po - -rm -f unittests/$(DEPDIR)/checksum.Po - -rm -f unittests/$(DEPDIR)/client.Po - -rm -f unittests/$(DEPDIR)/config.Po - -rm -f unittests/$(DEPDIR)/confirm.Po - -rm -f unittests/$(DEPDIR)/date.Po - -rm -f unittests/$(DEPDIR)/dev.Po - -rm -f unittests/$(DEPDIR)/diff.Po - -rm -f unittests/$(DEPDIR)/easyenglishbible.Po - -rm -f unittests/$(DEPDIR)/editone.Po - -rm -f unittests/$(DEPDIR)/etcbc4.Po - -rm -f unittests/$(DEPDIR)/export.Po - -rm -f unittests/$(DEPDIR)/flate.Po - -rm -f unittests/$(DEPDIR)/folders.Po - -rm -f unittests/$(DEPDIR)/french.Po - -rm -f unittests/$(DEPDIR)/gbs.Po - -rm -f unittests/$(DEPDIR)/git.Po - -rm -f unittests/$(DEPDIR)/html.Po - -rm -f unittests/$(DEPDIR)/html2format.Po - -rm -f unittests/$(DEPDIR)/html2usfm.Po - -rm -f unittests/$(DEPDIR)/http.Po - -rm -f unittests/$(DEPDIR)/hyphenate.Po - -rm -f unittests/$(DEPDIR)/image.Po - -rm -f unittests/$(DEPDIR)/ipc.Po - -rm -f unittests/$(DEPDIR)/javascript.Po - -rm -f unittests/$(DEPDIR)/jobs.Po - -rm -f unittests/$(DEPDIR)/json.Po - -rm -f unittests/$(DEPDIR)/kjv.Po - -rm -f unittests/$(DEPDIR)/ldap.Po - -rm -f unittests/$(DEPDIR)/lexicon.Po - -rm -f unittests/$(DEPDIR)/localization.Po - -rm -f unittests/$(DEPDIR)/log.Po - -rm -f unittests/$(DEPDIR)/login.Po - -rm -f unittests/$(DEPDIR)/mail.Po - -rm -f unittests/$(DEPDIR)/md5.Po - -rm -f unittests/$(DEPDIR)/memory.Po - -rm -f unittests/$(DEPDIR)/merge.Po - -rm -f unittests/$(DEPDIR)/modifications.Po - -rm -f unittests/$(DEPDIR)/morphgnt.Po - -rm -f unittests/$(DEPDIR)/navigation.Po - -rm -f unittests/$(DEPDIR)/nmt.Po - -rm -f unittests/$(DEPDIR)/notes.Po - -rm -f unittests/$(DEPDIR)/odf.Po - -rm -f unittests/$(DEPDIR)/oshb.Po - -rm -f unittests/$(DEPDIR)/pairs.Po - -rm -f unittests/$(DEPDIR)/paratext.Po - -rm -f unittests/$(DEPDIR)/passage.Po - -rm -f unittests/$(DEPDIR)/privileges.Po - -rm -f unittests/$(DEPDIR)/related.Po - -rm -f unittests/$(DEPDIR)/resources.Po - -rm -f unittests/$(DEPDIR)/roles.Po - -rm -f unittests/$(DEPDIR)/rss.Po - -rm -f unittests/$(DEPDIR)/sample.Po - -rm -f unittests/$(DEPDIR)/sblgnt.Po - -rm -f unittests/$(DEPDIR)/search.Po - -rm -f unittests/$(DEPDIR)/sentences.Po - -rm -f unittests/$(DEPDIR)/session.Po - -rm -f unittests/$(DEPDIR)/shell.Po - -rm -f unittests/$(DEPDIR)/space.Po - -rm -f unittests/$(DEPDIR)/sprint.Po - -rm -f unittests/$(DEPDIR)/sqlite.Po - -rm -f unittests/$(DEPDIR)/state.Po - -rm -f unittests/$(DEPDIR)/statistics.Po - -rm -f unittests/$(DEPDIR)/string.Po - -rm -f unittests/$(DEPDIR)/strong.Po - -rm -f unittests/$(DEPDIR)/studylight.Po - -rm -f unittests/$(DEPDIR)/styles.Po - -rm -f unittests/$(DEPDIR)/tasks.Po - -rm -f unittests/$(DEPDIR)/text.Po - -rm -f unittests/$(DEPDIR)/unittest.Po - -rm -f unittests/$(DEPDIR)/url.Po - -rm -f unittests/$(DEPDIR)/users.Po - -rm -f unittests/$(DEPDIR)/usfm.Po - -rm -f unittests/$(DEPDIR)/usfm2html.Po - -rm -f unittests/$(DEPDIR)/usfm2html2usfm.Po - -rm -f unittests/$(DEPDIR)/utilities.Po - -rm -f unittests/$(DEPDIR)/verses.Po - -rm -f unittests/$(DEPDIR)/versification.Po - -rm -f unittests/$(DEPDIR)/volatile.Po - -rm -f unittests/$(DEPDIR)/webview.Po - -rm -f unittests/$(DEPDIR)/workspaces.Po -rm -f user/$(DEPDIR)/account.Po -rm -f user/$(DEPDIR)/logic.Po -rm -f user/$(DEPDIR)/notifications.Po @@ -5967,93 +5504,6 @@ maintainer-clean: maintainer-clean-am -rm -f timer/$(DEPDIR)/index.Po -rm -f tmp/$(DEPDIR)/tmp.Po -rm -f trash/$(DEPDIR)/handler.Po - -rm -f unittests/$(DEPDIR)/archive.Po - -rm -f unittests/$(DEPDIR)/biblegateway.Po - -rm -f unittests/$(DEPDIR)/bibleimages.Po - -rm -f unittests/$(DEPDIR)/bibles.Po - -rm -f unittests/$(DEPDIR)/books.Po - -rm -f unittests/$(DEPDIR)/cache.Po - -rm -f unittests/$(DEPDIR)/check.Po - -rm -f unittests/$(DEPDIR)/checksum.Po - -rm -f unittests/$(DEPDIR)/client.Po - -rm -f unittests/$(DEPDIR)/config.Po - -rm -f unittests/$(DEPDIR)/confirm.Po - -rm -f unittests/$(DEPDIR)/date.Po - -rm -f unittests/$(DEPDIR)/dev.Po - -rm -f unittests/$(DEPDIR)/diff.Po - -rm -f unittests/$(DEPDIR)/easyenglishbible.Po - -rm -f unittests/$(DEPDIR)/editone.Po - -rm -f unittests/$(DEPDIR)/etcbc4.Po - -rm -f unittests/$(DEPDIR)/export.Po - -rm -f unittests/$(DEPDIR)/flate.Po - -rm -f unittests/$(DEPDIR)/folders.Po - -rm -f unittests/$(DEPDIR)/french.Po - -rm -f unittests/$(DEPDIR)/gbs.Po - -rm -f unittests/$(DEPDIR)/git.Po - -rm -f unittests/$(DEPDIR)/html.Po - -rm -f unittests/$(DEPDIR)/html2format.Po - -rm -f unittests/$(DEPDIR)/html2usfm.Po - -rm -f unittests/$(DEPDIR)/http.Po - -rm -f unittests/$(DEPDIR)/hyphenate.Po - -rm -f unittests/$(DEPDIR)/image.Po - -rm -f unittests/$(DEPDIR)/ipc.Po - -rm -f unittests/$(DEPDIR)/javascript.Po - -rm -f unittests/$(DEPDIR)/jobs.Po - -rm -f unittests/$(DEPDIR)/json.Po - -rm -f unittests/$(DEPDIR)/kjv.Po - -rm -f unittests/$(DEPDIR)/ldap.Po - -rm -f unittests/$(DEPDIR)/lexicon.Po - -rm -f unittests/$(DEPDIR)/localization.Po - -rm -f unittests/$(DEPDIR)/log.Po - -rm -f unittests/$(DEPDIR)/login.Po - -rm -f unittests/$(DEPDIR)/mail.Po - -rm -f unittests/$(DEPDIR)/md5.Po - -rm -f unittests/$(DEPDIR)/memory.Po - -rm -f unittests/$(DEPDIR)/merge.Po - -rm -f unittests/$(DEPDIR)/modifications.Po - -rm -f unittests/$(DEPDIR)/morphgnt.Po - -rm -f unittests/$(DEPDIR)/navigation.Po - -rm -f unittests/$(DEPDIR)/nmt.Po - -rm -f unittests/$(DEPDIR)/notes.Po - -rm -f unittests/$(DEPDIR)/odf.Po - -rm -f unittests/$(DEPDIR)/oshb.Po - -rm -f unittests/$(DEPDIR)/pairs.Po - -rm -f unittests/$(DEPDIR)/paratext.Po - -rm -f unittests/$(DEPDIR)/passage.Po - -rm -f unittests/$(DEPDIR)/privileges.Po - -rm -f unittests/$(DEPDIR)/related.Po - -rm -f unittests/$(DEPDIR)/resources.Po - -rm -f unittests/$(DEPDIR)/roles.Po - -rm -f unittests/$(DEPDIR)/rss.Po - -rm -f unittests/$(DEPDIR)/sample.Po - -rm -f unittests/$(DEPDIR)/sblgnt.Po - -rm -f unittests/$(DEPDIR)/search.Po - -rm -f unittests/$(DEPDIR)/sentences.Po - -rm -f unittests/$(DEPDIR)/session.Po - -rm -f unittests/$(DEPDIR)/shell.Po - -rm -f unittests/$(DEPDIR)/space.Po - -rm -f unittests/$(DEPDIR)/sprint.Po - -rm -f unittests/$(DEPDIR)/sqlite.Po - -rm -f unittests/$(DEPDIR)/state.Po - -rm -f unittests/$(DEPDIR)/statistics.Po - -rm -f unittests/$(DEPDIR)/string.Po - -rm -f unittests/$(DEPDIR)/strong.Po - -rm -f unittests/$(DEPDIR)/studylight.Po - -rm -f unittests/$(DEPDIR)/styles.Po - -rm -f unittests/$(DEPDIR)/tasks.Po - -rm -f unittests/$(DEPDIR)/text.Po - -rm -f unittests/$(DEPDIR)/unittest.Po - -rm -f unittests/$(DEPDIR)/url.Po - -rm -f unittests/$(DEPDIR)/users.Po - -rm -f unittests/$(DEPDIR)/usfm.Po - -rm -f unittests/$(DEPDIR)/usfm2html.Po - -rm -f unittests/$(DEPDIR)/usfm2html2usfm.Po - -rm -f unittests/$(DEPDIR)/utilities.Po - -rm -f unittests/$(DEPDIR)/verses.Po - -rm -f unittests/$(DEPDIR)/versification.Po - -rm -f unittests/$(DEPDIR)/volatile.Po - -rm -f unittests/$(DEPDIR)/webview.Po - -rm -f unittests/$(DEPDIR)/workspaces.Po -rm -f user/$(DEPDIR)/account.Po -rm -f user/$(DEPDIR)/logic.Po -rm -f user/$(DEPDIR)/notifications.Po diff --git a/config.h b/config.h index 7a4368638..8046ecf10 100644 --- a/config.h +++ b/config.h @@ -14,7 +14,6 @@ #define HAVE_GTEST 1 /* Define whether ICU is available */ -#define HAVE_ICU 1 /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -22,9 +21,6 @@ /* Define whether to compile for iOS */ /* #undef HAVE_IOS */ -/* Define to 1 if you have the `mbedtls' library (-lmbedtls). */ -/* #undef HAVE_LIBMBEDTLS */ - /* Define whether libproc.h is present */ #define HAVE_LIBPROC 1 @@ -32,7 +28,7 @@ /* #undef HAVE_LINUX */ /* Define whether to compile for Mac */ -/* #undef HAVE_MAC */ +#define HAVE_MAC 1 /* Define whether mach/mach.h is present */ #define HAVE_MACH_MACH 1 @@ -41,7 +37,6 @@ #define HAVE_PTHREAD 1 /* Define whether pugixml is available */ -#define HAVE_PUGIXML 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -74,7 +69,6 @@ #define HAVE_UNISTD_H 1 /* Define whether utf8proc is available */ -#define HAVE_UTF8PROC 1 /* Define whether to compile on Windows */ /* #undef HAVE_WINDOWS */ diff --git a/config.h.in b/config.h.in index 5f3831846..aef321a84 100644 --- a/config.h.in +++ b/config.h.in @@ -21,9 +21,6 @@ /* Define whether to compile for iOS */ #undef HAVE_IOS -/* Define to 1 if you have the `mbedtls' library (-lmbedtls). */ -#undef HAVE_LIBMBEDTLS - /* Define whether libproc.h is present */ #undef HAVE_LIBPROC diff --git a/configure b/configure index 3707796ef..b6b762e58 100755 --- a/configure +++ b/configure @@ -669,8 +669,6 @@ UTF8PROC_LIBS UTF8PROC_CFLAGS ICU_LIBS ICU_CFLAGS -HAVE_LIBMBEDTLS_FALSE -HAVE_LIBMBEDTLS_TRUE XML2_LIBS XML2_CFLAGS OPENSSL_LIBS @@ -1697,53 +1695,6 @@ printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_header_compile - -# ac_fn_cxx_try_link LINENO -# ------------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - } -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_link ac_configure_args_raw= for ac_arg do @@ -7008,56 +6959,6 @@ fi # linux AC_SUBST(WEBKIT2GTK_LIBS) # linux AC_SUBST(WEBKIT2GTK_CFLAGS) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbedtls_ssl_init in -lmbedtls" >&5 -printf %s "checking for mbedtls_ssl_init in -lmbedtls... " >&6; } -if test ${ac_cv_lib_mbedtls_mbedtls_ssl_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmbedtls $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -namespace conftest { - extern "C" int mbedtls_ssl_init (); -} -int -main (void) -{ -return conftest::mbedtls_ssl_init (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : - ac_cv_lib_mbedtls_mbedtls_ssl_init=yes -else $as_nop - ac_cv_lib_mbedtls_mbedtls_ssl_init=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mbedtls_mbedtls_ssl_init" >&5 -printf "%s\n" "$ac_cv_lib_mbedtls_mbedtls_ssl_init" >&6; } -if test "x$ac_cv_lib_mbedtls_mbedtls_ssl_init" = xyes -then : - printf "%s\n" "#define HAVE_LIBMBEDTLS 1" >>confdefs.h - - LIBS="-lmbedtls $LIBS" - -fi - - if test "$ac_cv_lib_mbedtls_ssl_init" = yes; then - HAVE_LIBMBEDTLS_TRUE= - HAVE_LIBMBEDTLS_FALSE='#' -else - HAVE_LIBMBEDTLS_TRUE='#' - HAVE_LIBMBEDTLS_FALSE= -fi - # Tag1 (leave in place) # Tag2 (leave in place) @@ -7828,10 +7729,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HAVE_LIBMBEDTLS_TRUE}" && test -z "${HAVE_LIBMBEDTLS_FALSE}"; then - as_fn_error $? "conditional \"HAVE_LIBMBEDTLS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${COMPILERGCC_TRUE}" && test -z "${COMPILERGCC_FALSE}"; then as_fn_error $? "conditional \"COMPILERGCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 07325aef4..022baba27 100644 --- a/configure.ac +++ b/configure.ac @@ -76,8 +76,6 @@ AC_SUBST(XML2_LIBS) # linux AC_SUBST(WEBKIT2GTK_LIBS) # linux AC_SUBST(WEBKIT2GTK_CFLAGS) -AC_CHECK_LIB([mbedtls], [mbedtls_ssl_init]) -AM_CONDITIONAL([HAVE_LIBMBEDTLS], [test "$ac_cv_lib_mbedtls_ssl_init" = yes]) # Tag1 (leave in place) # Tag2 (leave in place)