From 250afcb75f9fbd23a2445a0690d2c11ee2ff436b Mon Sep 17 00:00:00 2001 From: Davi Reis Date: Sat, 4 Jul 2009 20:17:36 -0700 Subject: [PATCH] Minor --- cdb/cdb.h | 39 ------------ cmph.pc.in | 2 +- src/Makefile | 150 ++++++++++++++++++++++++++--------------------- src/Makefile.in | 93 ++++++++++++++++------------- src/cmph.c | 18 +++--- src/cmph_types.h | 3 +- 6 files changed, 146 insertions(+), 159 deletions(-) delete mode 100644 cdb/cdb.h diff --git a/cdb/cdb.h b/cdb/cdb.h deleted file mode 100644 index aeb2316..0000000 --- a/cdb/cdb.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef __CMPH_CDB_H__ -#define __CMPH_CDB_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -typedef struct -{ - int fd; - void *data; -} cdb; - -int cdb_init(struct cdb *cdbp, int fd); -void cdb_free(struct cdb *cdbp); -int cdb_read(const struct cdb *cdbp, void *buf, cmph_uint32 len, cmph_uint32 pos); -int cdb_find(const struct cdb *cdbp, const void *key, cmph_uint32 keylen); -int cdb_read(const struct cdb *cdbp, void *buf, cmph_uint32 len, cmph_uint32 pos); - -typedef struct -{ - int fd; - void *data; -} cdb_make; - -int cdb_make_start(struct cdb_make *cdbmp, int fd); -int cdb_make_add(struct cdb_make *cdbmp, const void *key, cmph_uint32 keylen, const void *val, cmph_uint32 vallen); -int cdb_make_exists(struct cdb_make *cdbmp, const void *key, cmph_uint32 klen); -int cdb_make_find(struct cdb_make *cdbmp, const void *key, cmph_uint32 klen, enum cdb_put_mode mode); -int cdb_make_put(struct cdb_make *cdbmp, const void *key, cmph_uint32 klen, const void *val, cmph_uint32 vlen, enum cdb_put_mode mode); -int cdb_make_finish(struct cdb_make *cdbmp); - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/cmph.pc.in b/cmph.pc.in index 56589ac..6eb21c3 100644 --- a/cmph.pc.in +++ b/cmph.pc.in @@ -4,7 +4,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: alsa +Name: cmph Description: minimal perfect hashing library Version: @VERSION@ Libs: -L${libdir} -lcmph diff --git a/src/Makefile b/src/Makefile index 32c5e16..1808e19 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # src/Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -32,8 +32,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = i386-apple-darwin9.6.0 +host_triplet = i386-apple-darwin9.6.0 bin_PROGRAMS = cmph$(EXEEXT) subdir = src DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ @@ -59,9 +59,9 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libcmph_la_LIBADD = am_libcmph_la_OBJECTS = hash.lo jenkins_hash.lo vstack.lo vqueue.lo \ graph.lo cmph.lo cmph_structs.lo chm.lo bmz.lo bmz8.lo bdz.lo \ - bdz_ph.lo buffer_manager.lo buffer_entry.lo brz.lo fch.lo \ - fch_buckets.lo select.lo compressed_seq.lo chd_ph.lo \ - miller_rabin.lo + bdz_ph.lo brz.lo fch.lo fch_buckets.lo chd.lo chd_ph.lo \ + miller_rabin.lo buffer_manager.lo buffer_entry.lo select.lo \ + compressed_seq.lo compressed_rank.lo libcmph_la_OBJECTS = $(am_libcmph_la_OBJECTS) libcmph_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -90,52 +90,49 @@ HEADERS = $(include_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/fbotelho/papers/conferences/djamel/cmph/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/fbotelho/papers/conferences/djamel/cmph/missing --run tar +ACLOCAL = ${SHELL} /Users/davi/vc/cmph/missing --run aclocal-1.10 +AMTAR = ${SHELL} /Users/davi/vc/cmph/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/fbotelho/papers/conferences/djamel/cmph/missing --run autoconf -AUTOHEADER = ${SHELL} /home/fbotelho/papers/conferences/djamel/cmph/missing --run autoheader -AUTOMAKE = ${SHELL} /home/fbotelho/papers/conferences/djamel/cmph/missing --run automake-1.10 -AWK = gawk +AUTOCONF = ${SHELL} /Users/davi/vc/cmph/missing --run autoconf +AUTOHEADER = ${SHELL} /Users/davi/vc/cmph/missing --run autoheader +AUTOMAKE = ${SHELL} /Users/davi/vc/cmph/missing --run automake-1.10 +AWK = awk CC = gcc CCDEPMODE = depmode=gcc3 -CFLAGS = -O3 -Wall -Werror -lm +CFLAGS = -g -O2 CPP = gcc -E CPPFLAGS = +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 CYGPATH_W = echo DEFS = -DHAVE_CONFIG_H DEPDIR = .deps -DSYMUTIL = -DUMPBIN = +ECHO = echo ECHO_C = ECHO_N = -n ECHO_T = -EGREP = /bin/grep -E +EGREP = /usr/bin/grep -E EXEEXT = -FGREP = /bin/grep -F +F77 = +FFLAGS = GETCONF = getconf -GREP = /bin/grep +GREP = /usr/bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LD = /usr/bin/ld -m elf_x86_64 LDFLAGS = -LIBM = LIBOBJS = LIBS = LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/fbotelho/papers/conferences/djamel/cmph/missing --run makeinfo -MKDIR_P = /bin/mkdir -p -NM = /usr/bin/nm -B -NMEDIT = +MAKEINFO = ${SHELL} /Users/davi/vc/cmph/missing --run makeinfo +MKDIR_P = .././install-sh -c -d OBJEXT = o -OTOOL = -OTOOL64 = PACKAGE = cmph PACKAGE_BUGREPORT = PACKAGE_NAME = @@ -144,50 +141,49 @@ PACKAGE_TARNAME = PACKAGE_VERSION = PATH_SEPARATOR = : RANLIB = ranlib -SED = /bin/sed SET_MAKE = -SHELL = /bin/bash +SHELL = /bin/sh STRIP = strip -VERSION = 0.8 -abs_builddir = /home/fbotelho/papers/conferences/djamel/cmph/src -abs_srcdir = /home/fbotelho/papers/conferences/djamel/cmph/src -abs_top_builddir = /home/fbotelho/papers/conferences/djamel/cmph -abs_top_srcdir = /home/fbotelho/papers/conferences/djamel/cmph +VERSION = 0.9 +abs_builddir = /Users/davi/vc/cmph/src +abs_srcdir = /Users/davi/vc/cmph/src +abs_top_builddir = /Users/davi/vc/cmph +abs_top_srcdir = /Users/davi/vc/cmph ac_ct_CC = gcc -ac_ct_DUMPBIN = +ac_ct_CXX = g++ +ac_ct_F77 = am__include = include am__leading_dot = . am__quote = am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = i386-apple-darwin9.6.0 build_alias = -build_cpu = x86_64 -build_os = linux-gnu -build_vendor = unknown +build_cpu = i386 +build_os = darwin9.6.0 +build_vendor = apple builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = i386-apple-darwin9.6.0 host_alias = -host_cpu = x86_64 -host_os = linux-gnu -host_vendor = unknown +host_cpu = i386 +host_os = darwin9.6.0 +host_vendor = apple htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/fbotelho/papers/conferences/djamel/cmph/install-sh +install_sh = $(SHELL) /Users/davi/vc/cmph/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var -lt_ECHO = echo mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p +mkdir_p = $(top_builddir)/./install-sh -c -d oldincludedir = /usr/include pdfdir = ${docdir} prefix = /usr/local @@ -201,15 +197,30 @@ target_alias = top_builddir = .. top_srcdir = .. lib_LTLIBRARIES = libcmph.la -include_HEADERS = cmph.h cmph_types.h -libcmph_la_SOURCES = hash.c jenkins_hash.c\ - vstack.c vqueue.c\ - graph.c cmph.c cmph_structs.c\ - chm.c bmz.c bmz8.c bdz.c bdz_ph.c\ - buffer_manager.c buffer_entry.c\ - brz.c fch.c fch_buckets.c \ - select.c compressed_seq.c \ - chd_ph.c miller_rabin.c +include_HEADERS = cmph.h cmph_types.h cmph_time.h +libcmph_la_SOURCES = hash.h hash.c \ + jenkins_hash.h jenkins_hash.c\ + hash_state.h debug.h \ + vstack.h vstack.c vqueue.h vqueue.c\ + graph.h graph.c bitbool.h \ + cmph.h cmph.c cmph_structs.h cmph_structs.c\ + chm.h chm.c chm_structs.h \ + bmz.h bmz.c bmz_structs.h \ + bmz8.h bmz8.c bmz8_structs.h \ + bdz.h bdz.c bdz_structs.h \ + bdz_ph.h bdz_ph.c bdz_structs_ph.h \ + brz.h brz.c brz_structs.h \ + fch.h fch.c fch_structs.h \ + fch_buckets.h fch_buckets.c \ + chd.h chd.c chd_structs.h \ + chd_ph.h chd_ph.c chd_structs_ph.h \ + miller_rabin.h miller_rabin.c \ + buffer_manager.h buffer_manager.c \ + buffer_entry.h buffer_entry.c\ + select.h select.c select_lookup_tables.h \ + compressed_seq.h compressed_seq.c \ + compressed_rank.h compressed_rank.c \ + cmph_time.h libcmph_la_LDFLAGS = -version-info 0:0:0 cmph_SOURCES = main.c wingetopt.h wingetopt.c @@ -253,8 +264,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @@ -262,8 +273,8 @@ uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -285,8 +296,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -321,10 +332,12 @@ include ./$(DEPDIR)/bmz8.Plo include ./$(DEPDIR)/brz.Plo include ./$(DEPDIR)/buffer_entry.Plo include ./$(DEPDIR)/buffer_manager.Plo +include ./$(DEPDIR)/chd.Plo include ./$(DEPDIR)/chd_ph.Plo include ./$(DEPDIR)/chm.Plo include ./$(DEPDIR)/cmph.Plo include ./$(DEPDIR)/cmph_structs.Plo +include ./$(DEPDIR)/compressed_rank.Plo include ./$(DEPDIR)/compressed_seq.Plo include ./$(DEPDIR)/fch.Plo include ./$(DEPDIR)/fch_buckets.Plo @@ -387,8 +400,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -400,8 +413,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -411,12 +424,13 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff --git a/src/Makefile.in b/src/Makefile.in index 1976517..1abbd3c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -59,9 +59,9 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libcmph_la_LIBADD = am_libcmph_la_OBJECTS = hash.lo jenkins_hash.lo vstack.lo vqueue.lo \ graph.lo cmph.lo cmph_structs.lo chm.lo bmz.lo bmz8.lo bdz.lo \ - bdz_ph.lo buffer_manager.lo buffer_entry.lo brz.lo fch.lo \ - fch_buckets.lo select.lo compressed_seq.lo chd.lo chd_ph.lo \ - miller_rabin.lo compressed_rank.lo + bdz_ph.lo brz.lo fch.lo fch_buckets.lo chd.lo chd_ph.lo \ + miller_rabin.lo buffer_manager.lo buffer_entry.lo select.lo \ + compressed_seq.lo compressed_rank.lo libcmph_la_OBJECTS = $(am_libcmph_la_OBJECTS) libcmph_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -71,7 +71,7 @@ PROGRAMS = $(bin_PROGRAMS) am_cmph_OBJECTS = main.$(OBJEXT) wingetopt.$(OBJEXT) cmph_OBJECTS = $(am_cmph_OBJECTS) cmph_DEPENDENCIES = libcmph.la -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -102,17 +102,21 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -FGREP = @FGREP@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GETCONF = @GETCONF@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -120,22 +124,15 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -144,7 +141,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -154,7 +150,8 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -185,7 +182,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -201,16 +197,30 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libcmph.la -include_HEADERS = cmph.h cmph_types.h -libcmph_la_SOURCES = hash.c jenkins_hash.c\ - vstack.c vqueue.c\ - graph.c cmph.c cmph_structs.c\ - chm.c bmz.c bmz8.c bdz.c bdz_ph.c\ - buffer_manager.c buffer_entry.c\ - brz.c fch.c fch_buckets.c \ - select.c compressed_seq.c \ - chd.c chd_ph.c miller_rabin.c \ - compressed_rank.c +include_HEADERS = cmph.h cmph_types.h cmph_time.h +libcmph_la_SOURCES = hash.h hash.c \ + jenkins_hash.h jenkins_hash.c\ + hash_state.h debug.h \ + vstack.h vstack.c vqueue.h vqueue.c\ + graph.h graph.c bitbool.h \ + cmph.h cmph.c cmph_structs.h cmph_structs.c\ + chm.h chm.c chm_structs.h \ + bmz.h bmz.c bmz_structs.h \ + bmz8.h bmz8.c bmz8_structs.h \ + bdz.h bdz.c bdz_structs.h \ + bdz_ph.h bdz_ph.c bdz_structs_ph.h \ + brz.h brz.c brz_structs.h \ + fch.h fch.c fch_structs.h \ + fch_buckets.h fch_buckets.c \ + chd.h chd.c chd_structs.h \ + chd_ph.h chd_ph.c chd_structs_ph.h \ + miller_rabin.h miller_rabin.c \ + buffer_manager.h buffer_manager.c \ + buffer_entry.h buffer_entry.c\ + select.h select.c select_lookup_tables.h \ + compressed_seq.h compressed_seq.c \ + compressed_rank.h compressed_rank.c \ + cmph_time.h libcmph_la_LDFLAGS = -version-info 0:0:0 cmph_SOURCES = main.c wingetopt.h wingetopt.c @@ -254,8 +264,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @@ -263,8 +273,8 @@ uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -286,8 +296,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -390,8 +400,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -403,8 +413,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -414,12 +424,13 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff --git a/src/cmph.c b/src/cmph.c index 8726bec..cba735f 100644 --- a/src/cmph.c +++ b/src/cmph.c @@ -1,14 +1,14 @@ #include "cmph.h" #include "cmph_structs.h" #include "chm.h" -#include "bmz.h" /* included -- Fabiano */ -#include "bmz8.h" /* included -- Fabiano */ -#include "brz.h" /* included -- Fabiano */ -#include "fch.h" /* included -- Fabiano */ -#include "bdz.h" /* included -- Fabiano */ -#include "bdz_ph.h" /* included -- Fabiano */ -#include "chd_ph.h" /* included -- Fabiano */ -#include "chd.h" /* included -- Fabiano */ +#include "bmz.h" +#include "bmz8.h" +#include "brz.h" +#include "fch.h" +#include "bdz.h" +#include "bdz_ph.h" +#include "chd_ph.h" +#include "chd.h" #include #include @@ -16,7 +16,7 @@ //#define DEBUG #include "debug.h" -const char *cmph_names[] = {"bmz", "bmz8", "chm", "brz", "fch", "bdz", "bdz_ph", "chd_ph", "chd", NULL }; /* included -- Fabiano */ +const char *cmph_names[] = {"bmz", "bmz8", "chm", "brz", "fch", "bdz", "bdz_ph", "chd_ph", "chd", NULL }; typedef struct { diff --git a/src/cmph_types.h b/src/cmph_types.h index fa9c635..40f4332 100644 --- a/src/cmph_types.h +++ b/src/cmph_types.h @@ -35,7 +35,8 @@ typedef unsigned int cmph_uint32; typedef enum { CMPH_HASH_JENKINS, CMPH_HASH_COUNT } CMPH_HASH; extern const char *cmph_hash_names[]; typedef enum { CMPH_BMZ, CMPH_BMZ8, CMPH_CHM, CMPH_BRZ, CMPH_FCH, - CMPH_BDZ, CMPH_BDZ_PH, CMPH_CHD_PH, CMPH_CHD, CMPH_COUNT } CMPH_ALGO; /* included -- Fabiano */ + CMPH_BDZ, CMPH_BDZ_PH, + CMPH_CHD_PH, CMPH_CHD, CMPH_COUNT } CMPH_ALGO; extern const char *cmph_names[]; #endif