Attachment #318184 for bug #425776

View | Details | Raw Unified | Return to bug 425776
Collapse All | Expand All





httrack_LDADD = $(THREADS_LIBS) libhttrack.la
htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lminizip
proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT

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 \
	htsinthash.c htsmd5.c md5.c
	minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c

whttrackrundir = $(bindir)
whttrackrun_SCRIPTS = webhttrack

	htsmodules.c \
	md5.c \
	htsmms.c \
	minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c \
	mmsrip/error.c mmsrip/mms.c \
	hts-indextmpl.h htsalias.h htsback.h htsbase.h \
	htsbasenet.h htsbauth.h htscache.h htscatchurl.h  \

	htsstrings.h httrack-library.h \
	md5.h \
	htsmms.h \
	minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h \
	mmsrip/error.h mmsrip/mms.h
libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS) -lminizip
libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)

libhtsjava_la_SOURCES = htsjava.c htsjava.h

Lines 44-52 Please visit our Website: http://www.httrack.com Link Here

(-)a/src/htszlib.h (-3 / +3 lines)
44	//#include "zutil.h"	44	//#include "zutil.h"
45		45
46	/* MiniZip */	46	/* MiniZip */
47	#include "minizip/zip.h"	47	#include <minizip/zip.h>
48	#include "minizip/unzip.h"	48	#include <minizip/unzip.h>
49	#include "minizip/mztools.h"	49	#include <minizip/mztools.h>
50		50
51	/* Library internal definictions */	51	/* Library internal definictions */
52	#ifdef HTS_INTERNAL_BYTECODE	52	#ifdef HTS_INTERNAL_BYTECODE

Lines 141-147 Remark: If no cache newer than the added one is found, all entries can be added Link Here

(-)a/src/proxy/proxytrack.c (-1 / +1 lines)
141	#include "proxytrack.h"	141	#include "proxytrack.h"
142		142
143	/* Store manager */	143	/* Store manager */
144	#include "../minizip/mztools.h"	144	#include <minizip/mztools.h>
145	#include "store.h"	145	#include "store.h"
146		146
147	/* threads */	147	/* threads */

Lines 32-38 Please visit our Website: http://www.httrack.com Link Here

(-)a/src/proxy/proxytrack.h (-1 / +1 lines)
32	#define PROXYTRACK_VERSION "0.5"	32	#define PROXYTRACK_VERSION "0.5"
33		33
34	/* Store manager */	34	/* Store manager */
35	#include "../minizip/mztools.h"	35	#include <minizip/mztools.h>
36	#include "store.h"	36	#include "store.h"
37		37
38	#include <sys/stat.h>	38	#include <sys/stat.h>

Lines 45-52 Please visit our Website: http://www.httrack.com Link Here

(-)a/src/proxy/store.c (-3 / +2 lines)
45	#include "htsinthash.h"	45	#include "htsinthash.h"
46	#include "htsmd5.h"	46	#include "htsmd5.h"
47	#undef HTS_INTERNAL_BYTECODE	47	#undef HTS_INTERNAL_BYTECODE
48	#include "../minizip/mztools.h"	48	#include <minizip/mztools.h>
49	#include "../minizip/zip.h"	49	#include <minizip/zip.h>
50		50
51	#include "htscore.h"	51	#include "htscore.h"
52	#include "htsback.h"	52	#include "htsback.h"
53	-

Return to bug 425776

Lines 27-33 Link Here

(-)a/src/Makefile.am (-6 / +3 lines)
27		27
28	httrack_LDADD = $(THREADS_LIBS) libhttrack.la	28	httrack_LDADD = $(THREADS_LIBS) libhttrack.la
29	htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la	29	htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
30	proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)	30	proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lminizip
31	proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT	31	proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT
32		32
33	lib_LTLIBRARIES = libhttrack.la libhtsjava.la	33	lib_LTLIBRARIES = libhttrack.la libhtsjava.la
Lines 35-42 lib_LTLIBRARIES = libhttrack.la libhtsjava.la Link Here
35	htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h	35	htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h
36	proxytrack_SOURCES = proxy/main.c \	36	proxytrack_SOURCES = proxy/main.c \
37	proxy/proxytrack.c proxy/store.c \	37	proxy/proxytrack.c proxy/store.c \
38	htsinthash.c htsmd5.c md5.c \	38	htsinthash.c htsmd5.c md5.c
39	minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c
40		39
41	whttrackrundir = $(bindir)	40	whttrackrundir = $(bindir)
42	whttrackrun_SCRIPTS = webhttrack	41	whttrackrun_SCRIPTS = webhttrack
Lines 50-56 libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ Link Here
50	htsmodules.c \	49	htsmodules.c \
51	md5.c \	50	md5.c \
52	htsmms.c \	51	htsmms.c \
53	minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c \
54	mmsrip/error.c mmsrip/mms.c \	52	mmsrip/error.c mmsrip/mms.c \
55	hts-indextmpl.h htsalias.h htsback.h htsbase.h \	53	hts-indextmpl.h htsalias.h htsback.h htsbase.h \
56	htsbasenet.h htsbauth.h htscache.h htscatchurl.h \	54	htsbasenet.h htsbauth.h htscache.h htscatchurl.h \
Lines 63-71 libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ Link Here
63	htsstrings.h httrack-library.h \	61	htsstrings.h httrack-library.h \
64	md5.h \	62	md5.h \
65	htsmms.h \	63	htsmms.h \
66	minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h \
67	mmsrip/error.h mmsrip/mms.h	64	mmsrip/error.h mmsrip/mms.h
68	libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS)	65	libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS) -lminizip
69	libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)	66	libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
70		67
71	libhtsjava_la_SOURCES = htsjava.c htsjava.h	68	libhtsjava_la_SOURCES = htsjava.c htsjava.h