Attachment #102360 for bug #155727

Lines 22-31 Link Here

(-)htdig-3.2.0b6/Makefile.config.orig (-4 / +1 lines)
22	$(LOCAL_DEFINES) $(PROFILING)	22	$(LOCAL_DEFINES) $(PROFILING)
23		23
24	HTLIBS= $(top_builddir)/htnet/libhtnet.la \	24	HTLIBS= $(top_builddir)/htnet/libhtnet.la \
25	$(top_builddir)/htcommon/libcommon.la \
26	$(top_builddir)/htword/libhtword.la \
27	$(top_builddir)/htlib/libht.la \	25	$(top_builddir)/htlib/libht.la \
28	$(top_builddir)/htcommon/libcommon.la \	26	$(top_builddir)/htcommon/libcommon.la \
29	$(top_builddir)/htword/libhtword.la \	27	$(top_builddir)/htword/libhtword.la \
30	$(top_builddir)/db/libhtdb.la \	28	$(top_builddir)/db/libhtdb.la
31	$(top_builddir)/htlib/libht.la




include $(top_srcdir)/Makefile.config

pkglib_LTLIBRARIES = libht.la
libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la
libht_la_LIBADD= $(top_builddir)/db/libhtdb.la
libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \
	DB2_db.cc IntObject.cc List.cc Object.cc \
	ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \

	myqsort.c \
	md5.cc mhash_md5.c 

libht_la_LIBADD=@LTLIBOBJS@
# this includes regex.c

libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags}

pkginclude_HEADERS = \

Lines 10-16 Link Here

(-)htdig-3.2.0b6/htword/Makefile.am.orig (-1 / +2 lines)
10	LOCAL_DEFINES =	10	LOCAL_DEFINES =
11		11
12	pkglib_LTLIBRARIES = libhtword.la	12	pkglib_LTLIBRARIES = libhtword.la
13		13	libhtword_la_DEPENDENCIES = $(top_builddir)/htlib/libht.la
		14	libhtword_la_LIBADD = $(top_builddir)/htlib/libht.la
14	libhtword_la_SOURCES = \	15	libhtword_la_SOURCES = \
15	WordBitCompress.cc \	16	WordBitCompress.cc \
16	WordContext.cc \	17	WordContext.cc \

Lines 12-18 Link Here

(-)htdig-3.2.0b6/htcommon/Makefile.am.orig (-1 / +2 lines)
12	EXTRA_DIST=conf_lexer.cxx conf_parser.cxx	12	EXTRA_DIST=conf_lexer.cxx conf_parser.cxx
13		13
14	pkglib_LTLIBRARIES = libcommon.la	14	pkglib_LTLIBRARIES = libcommon.la
15		15	libcommon_la_DEPENDENCIES = $(top_builddir)/htword/libhtword.la
		16	libcommon_la_LIBADD = $(top_builddir)/htword/libhtword.la
16	libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \	17	libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \
17	HtWordReference.cc HtWordList.cc defaults.cc \	18	HtWordReference.cc HtWordList.cc defaults.cc \
18	HtURLCodec.cc URL.cc URLTrans.cc \	19	HtURLCodec.cc URL.cc URLTrans.cc \

Return to bug 155727

Lines 1-7 Link Here

(-)htdig-3.2.0b6/htlib/Makefile.am.orig (-4 / +2 lines)
1	include $(top_srcdir)/Makefile.config	1	include $(top_srcdir)/Makefile.config
2		2
3	pkglib_LTLIBRARIES = libht.la	3	pkglib_LTLIBRARIES = libht.la
4		4	libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la
		5	libht_la_LIBADD= $(top_builddir)/db/libhtdb.la
5	libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \	6	libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \
6	DB2_db.cc IntObject.cc List.cc Object.cc \	7	DB2_db.cc IntObject.cc List.cc Object.cc \
7	ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \	8	ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \
Lines 17-25 Link Here
17	myqsort.c \	18	myqsort.c \
18	md5.cc mhash_md5.c	19	md5.cc mhash_md5.c
19		20
20	libht_la_LIBADD=@LTLIBOBJS@
21	# this includes regex.c
22
23	libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags}	21	libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags}
24		22
25	pkginclude_HEADERS = \	23	pkginclude_HEADERS = \