diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/Makefile.in | 79 | ||||
| m--------- | src/coucal | 0 | ||||
| -rw-r--r-- | src/md5.h | 4 | ||||
| -rw-r--r-- | src/murmurhash3.h | 139 | ||||
| -rw-r--r-- | src/murmurhash3.h.diff | 22 |
6 files changed, 57 insertions, 197 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a7a0ebd..6937457 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,8 @@ AM_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ - -I \""$(srcdir)/coucal"\" + -I"$(abs_srcdir)" \ + -I"$(abs_srcdir)/coucal" bin_PROGRAMS = proxytrack httrack htsserver @@ -65,7 +66,7 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ htsstrings.h htsarrays.h httrack-library.h \ htscharset.h punycode.h htsencoding.h \ htsentities.h htsentities.sh htsbasiccharsets.sh htscodepages.h \ - md5.h murmurhash3.h \ + md5.h coucal/murmurhash3.h \ minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(OPENSSL_LIBS) $(DL_LIBS) $(SOCKET_LIBS) $(ICONV_LIBS) libhttrack_la_CFLAGS = $(AM_CFLAGS) -DLIBHTTRACK_EXPORTS -DZLIB_CONST @@ -76,8 +77,8 @@ libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO) EXTRA_DIST = httrack.h webhttrack \ - murmurhash3.h.diff \ - murmurhash3.h.orig \ + coucal/murmurhash3.h.diff \ + coucal/murmurhash3.h.orig \ minizip/iowin32.c \ minizip/iowin32.h \ minizip/ioapi.c.diff \ @@ -99,4 +100,5 @@ EXTRA_DIST = httrack.h webhttrack \ proxy/proxytrack.h \ proxy/store.h \ proxy/proxytrack.vcproj \ + coucal/* \ *.dsw *.dsp *.vcproj diff --git a/src/Makefile.in b/src/Makefile.in index fcdc0a0..a532f4d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -115,7 +115,7 @@ am_libhttrack_la_OBJECTS = libhttrack_la-htscore.lo \ libhttrack_la-htsparse.lo libhttrack_la-htsback.lo \ libhttrack_la-htscache.lo libhttrack_la-htscatchurl.lo \ libhttrack_la-htsfilters.lo libhttrack_la-htsftp.lo \ - libhttrack_la-htshash.lo libhttrack_la-coucal.lo \ + libhttrack_la-htshash.lo coucal/libhttrack_la-coucal.lo \ libhttrack_la-htshelp.lo libhttrack_la-htslib.lo \ libhttrack_la-htscoremain.lo libhttrack_la-htsname.lo \ libhttrack_la-htsrobots.lo libhttrack_la-htstools.lo \ @@ -147,9 +147,9 @@ httrack_OBJECTS = httrack.$(OBJEXT) httrack_DEPENDENCIES = $(am__DEPENDENCIES_1) libhttrack.la am_proxytrack_OBJECTS = proxy/proxytrack-main.$(OBJEXT) \ proxy/proxytrack-proxytrack.$(OBJEXT) \ - proxy/proxytrack-store.$(OBJEXT) proxytrack-coucal.$(OBJEXT) \ - proxytrack-htsmd5.$(OBJEXT) proxytrack-md5.$(OBJEXT) \ - minizip/proxytrack-ioapi.$(OBJEXT) \ + proxy/proxytrack-store.$(OBJEXT) \ + coucal/proxytrack-coucal.$(OBJEXT) proxytrack-htsmd5.$(OBJEXT) \ + proxytrack-md5.$(OBJEXT) minizip/proxytrack-ioapi.$(OBJEXT) \ minizip/proxytrack-mztools.$(OBJEXT) \ minizip/proxytrack-unzip.$(OBJEXT) \ minizip/proxytrack-zip.$(OBJEXT) @@ -342,7 +342,9 @@ AM_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(libdir)"\" + -DLIBDIR=\""$(libdir)"\" \ + -I"$(abs_srcdir)" \ + -I"$(abs_srcdir)/coucal" httrack_LDADD = $(THREADS_LIBS) libhttrack.la htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la @@ -353,13 +355,13 @@ lib_LTLIBRARIES = libhttrack.la libhtsjava.la htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h proxytrack_SOURCES = proxy/main.c \ proxy/proxytrack.c proxy/store.c \ - coucal.c htsmd5.c md5.c \ + coucal/coucal.c htsmd5.c md5.c \ minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c whttrackrundir = $(bindir) whttrackrun_SCRIPTS = webhttrack libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ - htscatchurl.c htsfilters.c htsftp.c htshash.c coucal.c \ + htscatchurl.c htsfilters.c htsftp.c htshash.c coucal/coucal.c \ htshelp.c htslib.c htscoremain.c \ htsname.c htsrobots.c htstools.c htswizard.c \ htsalias.c htsthread.c htsindex.c htsbauth.c \ @@ -370,7 +372,7 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ hts-indextmpl.h htsalias.h htsback.h htsbase.h htssafe.h \ htsbasenet.h htsbauth.h htscache.h htscatchurl.h \ htsconfig.h htscore.h htsparse.h htscoremain.h htsdefines.h \ - htsfilters.h htsftp.h htsglobal.h htshash.h coucal.h \ + htsfilters.h htsftp.h htsglobal.h htshash.h coucal/coucal.h \ htshelp.h htsindex.h htslib.h htsmd5.h \ htsmodules.h htsname.h htsnet.h \ htsopt.h htsrobots.h htsthread.h \ @@ -378,7 +380,7 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ htsstrings.h htsarrays.h httrack-library.h \ htscharset.h punycode.h htsencoding.h \ htsentities.h htsentities.sh htsbasiccharsets.sh htscodepages.h \ - md5.h murmurhash3.h \ + md5.h coucal/murmurhash3.h \ minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(OPENSSL_LIBS) $(DL_LIBS) $(SOCKET_LIBS) $(ICONV_LIBS) @@ -388,8 +390,8 @@ libhtsjava_la_SOURCES = htsjava.c htsjava.h libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO) EXTRA_DIST = httrack.h webhttrack \ - murmurhash3.h.diff \ - murmurhash3.h.orig \ + coucal/murmurhash3.h.diff \ + coucal/murmurhash3.h.orig \ minizip/iowin32.c \ minizip/iowin32.h \ minizip/ioapi.c.diff \ @@ -411,6 +413,7 @@ EXTRA_DIST = httrack.h webhttrack \ proxy/proxytrack.h \ proxy/store.h \ proxy/proxytrack.vcproj \ + coucal/* \ *.dsw *.dsp *.vcproj all: all-am @@ -481,6 +484,14 @@ clean-libLTLIBRARIES: done libhtsjava.la: $(libhtsjava_la_OBJECTS) $(libhtsjava_la_DEPENDENCIES) $(EXTRA_libhtsjava_la_DEPENDENCIES) $(libhtsjava_la_LINK) -rpath $(libdir) $(libhtsjava_la_OBJECTS) $(libhtsjava_la_LIBADD) $(LIBS) +coucal/$(am__dirstamp): + @$(MKDIR_P) coucal + @: > coucal/$(am__dirstamp) +coucal/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) coucal/$(DEPDIR) + @: > coucal/$(DEPDIR)/$(am__dirstamp) +coucal/libhttrack_la-coucal.lo: coucal/$(am__dirstamp) \ + coucal/$(DEPDIR)/$(am__dirstamp) minizip/$(am__dirstamp): @$(MKDIR_P) minizip @: > minizip/$(am__dirstamp) @@ -561,6 +572,8 @@ proxy/proxytrack-proxytrack.$(OBJEXT): proxy/$(am__dirstamp) \ proxy/$(DEPDIR)/$(am__dirstamp) proxy/proxytrack-store.$(OBJEXT): proxy/$(am__dirstamp) \ proxy/$(DEPDIR)/$(am__dirstamp) +coucal/proxytrack-coucal.$(OBJEXT): coucal/$(am__dirstamp) \ + coucal/$(DEPDIR)/$(am__dirstamp) minizip/proxytrack-ioapi.$(OBJEXT): minizip/$(am__dirstamp) \ minizip/$(DEPDIR)/$(am__dirstamp) minizip/proxytrack-mztools.$(OBJEXT): minizip/$(am__dirstamp) \ @@ -610,6 +623,9 @@ uninstall-whttrackrunSCRIPTS: mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f coucal/libhttrack_la-coucal.$(OBJEXT) + -rm -f coucal/libhttrack_la-coucal.lo + -rm -f coucal/proxytrack-coucal.$(OBJEXT) -rm -f minizip/libhttrack_la-ioapi.$(OBJEXT) -rm -f minizip/libhttrack_la-ioapi.lo -rm -f minizip/libhttrack_la-mztools.$(OBJEXT) @@ -633,7 +649,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver-htsserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver-htsweb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httrack.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-coucal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsalias.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsback.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsbauth.Plo@am__quote@ @@ -662,9 +677,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htszlib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-md5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-punycode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-coucal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-htsmd5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-md5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coucal/$(DEPDIR)/libhttrack_la-coucal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coucal/$(DEPDIR)/proxytrack-coucal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-mztools.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-unzip.Plo@am__quote@ @@ -757,12 +773,12 @@ libhttrack_la-htshash.lo: htshash.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-htshash.lo `test -f 'htshash.c' || echo '$(srcdir)/'`htshash.c -libhttrack_la-coucal.lo: coucal.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-coucal.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-coucal.Tpo -c -o libhttrack_la-coucal.lo `test -f 'coucal.c' || echo '$(srcdir)/'`coucal.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhttrack_la-coucal.Tpo $(DEPDIR)/libhttrack_la-coucal.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal.c' object='libhttrack_la-coucal.lo' libtool=yes @AMDEPBACKSLASH@ +coucal/libhttrack_la-coucal.lo: coucal/coucal.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT coucal/libhttrack_la-coucal.lo -MD -MP -MF coucal/$(DEPDIR)/libhttrack_la-coucal.Tpo -c -o coucal/libhttrack_la-coucal.lo `test -f 'coucal/coucal.c' || echo '$(srcdir)/'`coucal/coucal.c +@am__fastdepCC_TRUE@ $(am__mv) coucal/$(DEPDIR)/libhttrack_la-coucal.Tpo coucal/$(DEPDIR)/libhttrack_la-coucal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal/coucal.c' object='coucal/libhttrack_la-coucal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-coucal.lo `test -f 'coucal.c' || echo '$(srcdir)/'`coucal.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o coucal/libhttrack_la-coucal.lo `test -f 'coucal/coucal.c' || echo '$(srcdir)/'`coucal/coucal.c libhttrack_la-htshelp.lo: htshelp.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-htshelp.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-htshelp.Tpo -c -o libhttrack_la-htshelp.lo `test -f 'htshelp.c' || echo '$(srcdir)/'`htshelp.c @@ -1002,19 +1018,19 @@ proxy/proxytrack-store.obj: proxy/store.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxy/proxytrack-store.obj `if test -f 'proxy/store.c'; then $(CYGPATH_W) 'proxy/store.c'; else $(CYGPATH_W) '$(srcdir)/proxy/store.c'; fi` -proxytrack-coucal.o: coucal.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-coucal.o -MD -MP -MF $(DEPDIR)/proxytrack-coucal.Tpo -c -o proxytrack-coucal.o `test -f 'coucal.c' || echo '$(srcdir)/'`coucal.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-coucal.Tpo $(DEPDIR)/proxytrack-coucal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal.c' object='proxytrack-coucal.o' libtool=no @AMDEPBACKSLASH@ +coucal/proxytrack-coucal.o: coucal/coucal.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT coucal/proxytrack-coucal.o -MD -MP -MF coucal/$(DEPDIR)/proxytrack-coucal.Tpo -c -o coucal/proxytrack-coucal.o `test -f 'coucal/coucal.c' || echo '$(srcdir)/'`coucal/coucal.c +@am__fastdepCC_TRUE@ $(am__mv) coucal/$(DEPDIR)/proxytrack-coucal.Tpo coucal/$(DEPDIR)/proxytrack-coucal.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal/coucal.c' object='coucal/proxytrack-coucal.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-coucal.o `test -f 'coucal.c' || echo '$(srcdir)/'`coucal.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o coucal/proxytrack-coucal.o `test -f 'coucal/coucal.c' || echo '$(srcdir)/'`coucal/coucal.c -proxytrack-coucal.obj: coucal.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-coucal.obj -MD -MP -MF $(DEPDIR)/proxytrack-coucal.Tpo -c -o proxytrack-coucal.obj `if test -f 'coucal.c'; then $(CYGPATH_W) 'coucal.c'; else $(CYGPATH_W) '$(srcdir)/coucal.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-coucal.Tpo $(DEPDIR)/proxytrack-coucal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal.c' object='proxytrack-coucal.obj' libtool=no @AMDEPBACKSLASH@ +coucal/proxytrack-coucal.obj: coucal/coucal.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT coucal/proxytrack-coucal.obj -MD -MP -MF coucal/$(DEPDIR)/proxytrack-coucal.Tpo -c -o coucal/proxytrack-coucal.obj `if test -f 'coucal/coucal.c'; then $(CYGPATH_W) 'coucal/coucal.c'; else $(CYGPATH_W) '$(srcdir)/coucal/coucal.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) coucal/$(DEPDIR)/proxytrack-coucal.Tpo coucal/$(DEPDIR)/proxytrack-coucal.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal/coucal.c' object='coucal/proxytrack-coucal.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-coucal.obj `if test -f 'coucal.c'; then $(CYGPATH_W) 'coucal.c'; else $(CYGPATH_W) '$(srcdir)/coucal.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o coucal/proxytrack-coucal.obj `if test -f 'coucal/coucal.c'; then $(CYGPATH_W) 'coucal/coucal.c'; else $(CYGPATH_W) '$(srcdir)/coucal/coucal.c'; fi` proxytrack-htsmd5.o: htsmd5.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-htsmd5.o -MD -MP -MF $(DEPDIR)/proxytrack-htsmd5.Tpo -c -o proxytrack-htsmd5.o `test -f 'htsmd5.c' || echo '$(srcdir)/'`htsmd5.c @@ -1105,6 +1121,7 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs + -rm -rf coucal/.libs coucal/_libs -rm -rf minizip/.libs minizip/_libs install-DevIncludesDATA: $(DevIncludes_DATA) @$(NORMAL_INSTALL) @@ -1245,6 +1262,8 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f coucal/$(DEPDIR)/$(am__dirstamp) + -rm -f coucal/$(am__dirstamp) -rm -f minizip/$(DEPDIR)/$(am__dirstamp) -rm -f minizip/$(am__dirstamp) -rm -f proxy/$(DEPDIR)/$(am__dirstamp) @@ -1259,7 +1278,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) minizip/$(DEPDIR) proxy/$(DEPDIR) + -rm -rf ./$(DEPDIR) coucal/$(DEPDIR) minizip/$(DEPDIR) proxy/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1305,7 +1324,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) minizip/$(DEPDIR) proxy/$(DEPDIR) + -rm -rf ./$(DEPDIR) coucal/$(DEPDIR) minizip/$(DEPDIR) proxy/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/coucal b/src/coucal -Subproject 7d5326958b2b86073684c223d315f07dc452070 +Subproject fde512d21cb0ea65403a882ed784e9ac41e588c @@ -17,7 +17,7 @@ typedef unsigned long uint32; #error undefined: SIZEOF_LONG #endif -struct MD5Context { +typedef struct MD5Context { union { unsigned char ui8[64]; uint32 ui32[16]; @@ -25,7 +25,7 @@ struct MD5Context { uint32 buf[4]; uint32 bits[2]; int doByteReverse; -}; +} MD5CTX; void MD5Init(struct MD5Context *context, int brokenEndian); void MD5Update(struct MD5Context *context, unsigned char const *buf, diff --git a/src/murmurhash3.h b/src/murmurhash3.h deleted file mode 100644 index 56524d9..0000000 --- a/src/murmurhash3.h +++ /dev/null @@ -1,139 +0,0 @@ -//----------------------------------------------------------------------------- -// MurmurHash3 was written by Austin Appleby, and is placed in the public -// domain. The author hereby disclaims copyright to this source code. - -// Note - The x86 and x64 versions do _not_ produce the same results, as the -// algorithms are optimized for their respective platforms. You can still -// compile and run any of them on any platform, but your performance with the -// non-native version will be less than optimal. - -#ifdef _WIN32 -#include <stddef.h> -typedef __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; -#elif (defined(SOLARIS) || defined(sun) || defined(HAVE_INTTYPES_H) \ - || defined(BSD) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)) -#include <inttypes.h> -#else -#include <stdint.h> -#endif - -static uint32_t rotl32 ( uint32_t x, int8_t r ) -{ - return (x << r) | (x >> (32 - r)); -} -#define ROTL32(x,y) rotl32(x,y) -static uint32_t getblock32 ( const uint32_t * p, int i ) -{ - return p[i]; -} -static uint32_t fmix32 ( uint32_t h ) -{ - h ^= h >> 16; - h *= 0x85ebca6b; - h ^= h >> 13; - h *= 0xc2b2ae35; - h ^= h >> 16; - - return h; -} -#define BIG_CONSTANT(x) (x##LLU) -static void MurmurHash3_x86_128 ( const void * key, const int len, - uint32_t seed, void * out ) { - const uint8_t * data = (const uint8_t*)key; - const int nblocks = len / 16; - - uint32_t h1 = seed; - uint32_t h2 = seed; - uint32_t h3 = seed; - uint32_t h4 = seed; - - const uint32_t c1 = 0x239b961b; - const uint32_t c2 = 0xab0e9789; - const uint32_t c3 = 0x38b34ae5; - const uint32_t c4 = 0xa1e38b93; - - const uint32_t * blocks = (const uint32_t *)(data + nblocks*16); - int i; - - for(i = -nblocks; i; i++) - { - uint32_t k1 = getblock32(blocks,i*4+0); - uint32_t k2 = getblock32(blocks,i*4+1); - uint32_t k3 = getblock32(blocks,i*4+2); - uint32_t k4 = getblock32(blocks,i*4+3); - - k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1; - - h1 = ROTL32(h1,19); h1 += h2; h1 = h1*5+0x561ccd1b; - - k2 *= c2; k2 = ROTL32(k2,16); k2 *= c3; h2 ^= k2; - - h2 = ROTL32(h2,17); h2 += h3; h2 = h2*5+0x0bcaa747; - - k3 *= c3; k3 = ROTL32(k3,17); k3 *= c4; h3 ^= k3; - - h3 = ROTL32(h3,15); h3 += h4; h3 = h3*5+0x96cd1c35; - - k4 *= c4; k4 = ROTL32(k4,18); k4 *= c1; h4 ^= k4; - - h4 = ROTL32(h4,13); h4 += h1; h4 = h4*5+0x32ac3b17; - } - - { - const uint8_t * tail = (const uint8_t*)(data + nblocks*16); - - uint32_t k1 = 0; - uint32_t k2 = 0; - uint32_t k3 = 0; - uint32_t k4 = 0; - - switch(len & 15) - { - case 15: k4 ^= tail[14] << 16; - case 14: k4 ^= tail[13] << 8; - case 13: k4 ^= tail[12] << 0; - k4 *= c4; k4 = ROTL32(k4,18); k4 *= c1; h4 ^= k4; - - case 12: k3 ^= tail[11] << 24; - case 11: k3 ^= tail[10] << 16; - case 10: k3 ^= tail[ 9] << 8; - case 9: k3 ^= tail[ 8] << 0; - k3 *= c3; k3 = ROTL32(k3,17); k3 *= c4; h3 ^= k3; - - case 8: k2 ^= tail[ 7] << 24; - case 7: k2 ^= tail[ 6] << 16; - case 6: k2 ^= tail[ 5] << 8; - case 5: k2 ^= tail[ 4] << 0; - k2 *= c2; k2 = ROTL32(k2,16); k2 *= c3; h2 ^= k2; - - case 4: k1 ^= tail[ 3] << 24; - case 3: k1 ^= tail[ 2] << 16; - case 2: k1 ^= tail[ 1] << 8; - case 1: k1 ^= tail[ 0] << 0; - k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1; - }; - - - h1 ^= len; h2 ^= len; h3 ^= len; h4 ^= len; - - h1 += h2; h1 += h3; h1 += h4; - h2 += h1; h3 += h1; h4 += h1; - - h1 = fmix32(h1); - h2 = fmix32(h2); - h3 = fmix32(h3); - h4 = fmix32(h4); - - h1 += h2; h1 += h3; h1 += h4; - h2 += h1; h3 += h1; h4 += h1; - - ((uint32_t*)out)[0] = h1; - ((uint32_t*)out)[1] = h2; - ((uint32_t*)out)[2] = h3; - ((uint32_t*)out)[3] = h4; - } -} diff --git a/src/murmurhash3.h.diff b/src/murmurhash3.h.diff deleted file mode 100644 index a5a067e..0000000 --- a/src/murmurhash3.h.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- murmurhash3.h.orig 2014-06-14 14:29:11.562576736 +0200 -+++ murmurhash3.h 2014-06-14 14:39:43.989624584 +0200 -@@ -7,7 +7,19 @@ - // compile and run any of them on any platform, but your performance with the - // non-native version will be less than optimal. - -+#ifdef _WIN32 -+#include <stddef.h> -+typedef __int8 int8_t; -+typedef unsigned __int8 uint8_t; -+typedef unsigned __int16 uint16_t; -+typedef unsigned __int32 uint32_t; -+typedef unsigned __int64 uint64_t; -+#elif (defined(SOLARIS) || defined(sun) || defined(HAVE_INTTYPES_H) \ -+ || defined(BSD) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)) -+#include <inttypes.h> -+#else - #include <stdint.h> -+#endif - - static uint32_t rotl32 ( uint32_t x, int8_t r ) - { |