Allow new cache to be built with MOZ_TRACK_MODULE_DEPS. r=cls@seawood.org

netwerk/cache/src/Makefile.in

@@ -26,11 +26,10 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= nkcacheservice
+MODULE		= nkcache
-XPIDL_MODULE    = nkcacheservice
 LIBRARY_NAME	= nkcacheservice
 IS_COMPONENT	= 1
-REQUIRES	= xpcom necko pref js
+REQUIRES	= xpcom string necko pref js
 
 EXPORTS		= \
 		nsCacheService.h \
@@ -49,8 +48,6 @@ CPPSRCS		= \
 
 include $(topsrcdir)/config/config.mk
 
-LOCAL_INCLUDES	= -I$(srcdir)/../public -I$(srcdir)/../include
-
 LIBS           += \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \

netwerk/protocol/ftp/src/Makefile.in

@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 LIBRARY_NAME	= nkftp_s
-REQUIRES	= xpcom string exthandler mime wallet dom layout widget pref
+REQUIRES	= xpcom string exthandler mime wallet dom layout widget pref nkcache
 
 CPPSRCS		= \
 		nsFtpProtocolHandler.cpp \

netwerk/test/Makefile.in

@@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= test_necko
-REQUIRES	= xpcom string necko timer cookie layout widget dom dbm
+REQUIRES	= xpcom string necko nkcache timer cookie layout widget dom dbm
 
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX)