Updated the UNIX makefiles to be in sync with the Windows ones. (Not Part of the build).

docshell/Makefile.in

@@ -25,6 +25,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS=base html build
+DIRS=base build
 
 include $(topsrcdir)/config/rules.mk

docshell/base/Makefile.in

@@ -29,17 +29,17 @@ LIBRARY_NAME	= basedocshell_s
 include $(DEPTH)/config/autoconf.mk
 
 XPIDLSRCS	= \
+		nsCDocShell.idl			\
 		nsIDocShell.idl			\
 		nsIDocShellContainer.idl	\
-		nsIDocShellFile.idl		\
-		nsIDocShellEdit.idl		\
-		nsIGenericWindow.idl		\
+		nsIMarkupDocumentViewer.idl		\
 		nsIScrollable.idl		\
 		nsITextScroll.idl		\
 		$(NULL)
 
 CPPSRCS		= \
-		nsDocShellBase.cpp		\
+		nsDocShell.cpp		\
+		nsDSURIContentListener.cpp		\
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a

docshell/build/Makefile.in

@@ -43,5 +43,4 @@ include $(topsrcdir)/config/rules.mk
 INCLUDES	+= \
 		-I$(srcdir)			\
 		-I$(srcdir)/../base		\
-		-I$(srcdir)/../html		\
 		$(NULL)