diff -urNp libwww.orig/Library/src/Makefile.am libwww/Library/src/Makefile.am
--- libwww.orig/Library/src/Makefile.am	2008-12-21 14:56:35.057990122 +0530
+++ libwww/Library/src/Makefile.am	2008-12-21 15:32:12.209980528 +0530
@@ -159,6 +159,8 @@ libwwwtrans_la_SOURCES = \
 	HTWriter.h \
 	HTWriter.c
 
+libwwwtrans_la_LIBADD = libwwwcore.la
+
 libwwwstream_la_SOURCES = \
 	WWWStream.h \
 	HTConLen.h \
@@ -198,6 +200,8 @@ libwwwfile_la_SOURCES = \
 	HTMulti.h \
 	HTMulti.c
 
+libwwwfile_la_LIBADD = libwwwtrans.la
+
 libwwwftp_la_SOURCES = \
 	WWWFTP.h \
 	HTFTP.h \
@@ -334,6 +338,24 @@ libwwwapp_la_SOURCES = \
 	HTRules.h \
 	HTRules.c
 
+libwwwapp_la_LIBADD = \
+	libwwwcache.la \
+	libwwwdir.la \
+	libwwwfile.la \
+	libwwwftp.la \
+	libwwwgopher.la \
+	libwwwhtml.la \
+	libwwwhttp.la \
+	libwwwmime.la \
+	libwwwnews.la \
+	libwwwstream.la \
+	libwwwtelnet.la \
+	libwwwtrans.la \
+	libwwwutils.la \
+	libwwwxml.la \
+	libwwwzip.la \
+	libwwwcore.la
+
 libwwwinit_la_SOURCES = \
 	WWWInit.h \
 	HTProfil.h \
@@ -362,10 +384,7 @@ libwwwxml_la_SOURCES = \
 	HTXML.h \
 	HTXML.c
 
-libwwwxml_la_DEPENDENCIES = \
-	../../modules/expat/libexpat.la
-
-libwwwxml_la_LDFLAGS = -rpath $(libdir)
+libwwwxml_la_LDFLAGS = -lexpat -rpath $(libdir)
 
 libwwwzip_la_SOURCES = \
 	WWWZip.h \
@@ -375,6 +394,10 @@ libwwwzip_la_SOURCES = \
 
 libwwwzip_la_LDFLAGS = -rpath $(libdir)
 
+libwwwzip_la_LIBADD = \
+	libwwwutils.la \
+	libwwwcore.la
+
 libwwwsql_la_SOURCES = \
 	WWWSQL.h \
 	HTSQL.h \
@@ -386,9 +409,8 @@ libwwwsql_la_SOURCES = \
 libwwwsql_la_LDFLAGS = -rpath $(libdir)
 
 INCLUDES = \
-	-I/usr/local/include \
 	-I${top_srcdir}/modules/md5 \
-	-I${top_srcdir}/modules/expat/lib
+	-I$(includedir)
 
 BUILT_SOURCES = \
 	wwwsys.h \
@@ -405,7 +405,6 @@
 	HTBInit.h \
 	HTBTree.h \
 	HTBind.h \
-	HTBind.h \
 	HTBound.h \
 	HTBufWrt.h \
 	HTCache.h \
diff -urNp libwww.orig/modules/Makefile.am libwww/modules/Makefile.am
--- libwww.orig/modules/Makefile.am	2008-12-21 14:56:37.380980403 +0530
+++ libwww/modules/Makefile.am	2008-12-21 14:56:45.892980322 +0530
@@ -5,5 +5,5 @@ DOCS :=	$(wildcard *.html *.gif)
 EXTRA_DIST = \
 	$(DOCS)
 
-SUBDIRS = expat md5
+SUBDIRS = md5