motiejus/turbonss
1
Fork 0
Code Releases Activity

Several build fixes.

Browse Source
This commit is contained in:
Davi de Castro Reis 2012-06-02 23:17:45 -03:00
parent e808f82311
commit 20a67137d4
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -34,7 +34,7 @@ LDFLAGS="$LIBM $LDFLAGS"
CFLAGS="-Wall" CFLAGS="-Wall"
AC_PROG_CXX AC_PROG_CXX
CXXFLAGS="-Werror -Wall -Wno-unused-function -DNDEBUG -O3 -fomit-frame-pointer $CXXFLAGS" CXXFLAGS="-Wall -Wno-unused-function -DNDEBUG -O3 -fomit-frame-pointer $CXXFLAGS"
AC_ENABLE_CXXMPH AC_ENABLE_CXXMPH
if test x$cxxmph = xtrue; then if test x$cxxmph = xtrue; then
AC_COMPILE_STDCXX_0X AC_COMPILE_STDCXX_0X
@ -50,10 +50,12 @@ if test x$cxxmph = xtrue; then
AC_SUBST([CXXMPH], "cxxmph") AC_SUBST([CXXMPH], "cxxmph")
fi fi
PKG_CHECK_MODULES([CHECK], [check >= 0.9.8]) PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [HAVE_LIBCHECK=1], [HAVE_LIBCHECK=])
if test "x$CHECK_LIBS" = "x" ; then if test "x$CHECK_LIBS" = "x" ; then
if test "x$cxxmph" = "xtrue"; then
AC_MSG_WARN([Testing library not found, make check will fail.]) AC_MSG_WARN([Testing library not found, make check will fail.])
fi fi
fi
AC_SUBST(CHECK_LIBS) AC_SUBST(CHECK_LIBS)
AC_SUBST(CHECK_CFLAGS) AC_SUBST(CHECK_CFLAGS)

19
cxxmph/Makefile.am
View File

@ -4,14 +4,17 @@ noinst_PROGRAMS = bm_index bm_map
bin_PROGRAMS = cxxmph bin_PROGRAMS = cxxmph
cxxmph_includedir = $(includedir)/cxxmph/ cxxmph_includedir = $(includedir)/cxxmph/
cxxmph_include_HEADERS = mph_map.h mph_index.h MurmurHash3.h trigraph.h seeded_hash.h stringpiece.h hollow_iterator.h cxxmph_include_HEADERS = mph_bits.h mph_map.h mph_index.h MurmurHash3.h trigraph.h seeded_hash.h stringpiece.h hollow_iterator.h string_util.h
noinst_LTLIBRARIES = libcxxmph_test.la check_LTLIBRARIES = libcxxmph_test.la
noinst_LTLIBRARIES = libcxxmph_bm.la
lib_LTLIBRARIES = libcxxmph.la lib_LTLIBRARIES = libcxxmph.la
libcxxmph_la_SOURCES = MurmurHash3.h MurmurHash3.cpp trigragh.h trigraph.cc mph_bits.h mph_bits.cc mph_index.h mph_index.cc seeded_hash.h stringpiece.h benchmark.h benchmark.cc string_util.cc libcxxmph_la_SOURCES = MurmurHash3.cpp trigraph.cc mph_bits.cc mph_index.cc benchmark.h benchmark.cc string_util.cc
libcxxmph_la_LDFLAGS = -version-info 0:0:0 libcxxmph_la_LDFLAGS = -version-info 0:0:0
libcxxmph_test_la_SOURCES = test.h test.cc libcxxmph_test_la_SOURCES = test.h test.cc
libcxxmph_test_la_LIBADD = libcxxmph.la libcxxmph_test_la_LIBADD = libcxxmph.la
libcxxmph_bm_la_SOURCES = benchmark.h benchmark.cc bm_common.h bm_common.cc
libcxxmph_bm_la_LIBADD = libcxxmph.la
test_test_SOURCES = test_test.cc test_test_SOURCES = test_test.cc
test_test_LDADD = libcxxmph_test.la $(CHECK_LIBS) test_test_LDADD = libcxxmph_test.la $(CHECK_LIBS)
@ -22,14 +25,14 @@ mph_map_test_SOURCES = mph_map_test.cc
mph_index_test_LDADD = libcxxmph.la mph_index_test_LDADD = libcxxmph.la
mph_index_test_SOURCES = mph_index_test.cc mph_index_test_SOURCES = mph_index_test.cc
bm_index_LDADD = libcxxmph.la -lcmph
bm_index_SOURCES = bm_common.cc bm_index.cc
trigraph_test_LDADD = libcxxmph.la trigraph_test_LDADD = libcxxmph.la
trigraph_test_SOURCES = trigraph_test.cc trigraph_test_SOURCES = trigraph_test.cc
bm_map_LDADD = libcxxmph.la bm_index_LDADD = libcxxmph_bm.la -lcmph
bm_map_SOURCES = bm_common.cc bm_map.cc bm_index_SOURCES = bm_index.cc
bm_map_LDADD = libcxxmph_bm.la
bm_map_SOURCES = bm_map.cc
cxxmph_LDADD = libcxxmph.la cxxmph_LDADD = libcxxmph.la
cxxmph_SOURCES = cxxmph.cc cxxmph_SOURCES = cxxmph.cc

2
src/Makefile.am
View File

@ -3,7 +3,7 @@ noinst_PROGRAMS = bm_numbers
lib_LTLIBRARIES = libcmph.la lib_LTLIBRARIES = libcmph.la
include_HEADERS = cmph.h cmph_types.h cmph_time.h chd_ph.h include_HEADERS = cmph.h cmph_types.h cmph_time.h chd_ph.h
libcmph_la_SOURCES = hash.h hash.c \ libcmph_la_SOURCES = hash.h hash.c \
jenkins_hash.h jenkins_hash.c MurmurHash2.h\ jenkins_hash.h jenkins_hash.c \
hash_state.h debug.h \ hash_state.h debug.h \
vstack.h vstack.c vqueue.h vqueue.c\ vstack.h vstack.c vqueue.h vqueue.c\
graph.h graph.c bitbool.h \ graph.h graph.c bitbool.h \