diff --git a/src/Makefile.am b/src/Makefile.am index e56a8a2..4adcc48 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = $(top_builddir)/bin/vsearch if TARGET_PPC AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -mcpu=power8 else -AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -march=x86-64 -mtune=generic +AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -lcityhash endif AM_CFLAGS=$(AM_CXXFLAGS) @@ -18,8 +18,6 @@ allpairs.h \ arch.h \ bitmap.h \ chimera.h \ -city.h \ -citycrc.h \ cluster.h \ cpu.h \ db.h \ @@ -59,31 +57,26 @@ xstring.h if TARGET_PPC libcpu_a_SOURCES = cpu.cc $(VSEARCHHEADERS) -noinst_LIBRARIES = libcpu.a libcityhash.a +noinst_LIBRARIES = libcpu.a else libcpu_sse2_a_SOURCES = cpu.cc $(VSEARCHHEADERS) libcpu_sse2_a_CXXFLAGS = $(AM_CXXFLAGS) -msse2 libcpu_ssse3_a_SOURCES = cpu.cc $(VSEARCHHEADERS) libcpu_ssse3_a_CXXFLAGS = $(AM_CXXFLAGS) -mssse3 -DSSSE3 -noinst_LIBRARIES = libcpu_sse2.a libcpu_ssse3.a libcityhash.a +noinst_LIBRARIES = libcpu_sse2.a libcpu_ssse3.a endif -libcityhash_a_SOURCES = city.cc city.h - if TARGET_WIN -libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare -D_MSC_VER -__top_builddir__bin_vsearch_LDFLAGS = -static -__top_builddir__bin_vsearch_LDADD = libregex.a libcityhash.a libcpu_ssse3.a libcpu_sse2.a +__top_builddir__bin_vsearch_LDFLAGS = -static -lcityhash +__top_builddir__bin_vsearch_LDADD = libregex.a libcpu_ssse3.a libcpu_sse2.a else -libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare - if TARGET_PPC -__top_builddir__bin_vsearch_LDADD = libcityhash.a libcpu.a +__top_builddir__bin_vsearch_LDADD = libcpu.a else -__top_builddir__bin_vsearch_LDADD = libcityhash.a libcpu_ssse3.a libcpu_sse2.a +__top_builddir__bin_vsearch_LDADD = libcpu_ssse3.a libcpu_sse2.a endif endif diff --git a/src/vsearch.h b/src/vsearch.h index f2c244b..5f51bbe 100644 --- a/src/vsearch.h +++ b/src/vsearch.h @@ -148,7 +148,7 @@ #include #endif -#include "city.h" +#include #include "md5.h" #include "sha1.h" 08548084299272d9ee621170e224ec63de8dd'>HACKING
AgeCommit message (Expand)Author
2020-10-23doc: Fix typo in HACKING....* HACKING (Contributing): s/informations/information/. Maxim Cournoyer
2020-01-09doc: Move "Commit Access" section from 'HACKING' to the manual....* HACKING (Commit Access): Remove. (Contributing): Update URL of the manual. * doc/contributing.texi (Commit Access): New section. (Submitting Patches): Add cross reference. Ludovic Courtès
2020-01-09doc: Add "Tracking Bugs and Patches" section....* doc/contributing.texi (Tracking Bugs and Patches): New section. (Submitting Patches): Refer to it. * doc/guix.texi: Update copyright line. * HACKING (Using emacs-debbugs): Remove. Ludovic Courtès
2019-07-13doc: Update keyserver URL....* HACKING (Commit Access): Change keyserver URL to 'keys.openpgp.org'. Leo Famulari
2019-02-11HACKING: Update key server....* HACKING (Commit Access): Recommend pool.sks-keyservers.net. Ludovic Courtès
2018-07-22doc: Fix typo (missing period)...* HACKING (Commit Access): Fix typo. Pierre Neidhardt
2017-08-19doc: Mention how to use emacs-debbugs....* HACKING (Using emacs-debbugs): Add section on using emacs-debbugs. Arun Isaac
2017-03-27maint: Give command to install the pre-push hook....* HACKING: Add 'cp' line to install the pre-push hook. Ludovic Courtès
2017-03-24maint: Mention the Signed-off-by line in 'HACKING'....* HACKING: Mention the Signed-off-by line. Clément Lassieur
2017-03-15maint: Mention guix-patches@gnu.org in 'HACKING'....Fixes <http://bugs.gnu.org/25899>. * HACKING: Mention guix-patches@gnu.org. Ludovic Courtès