Fixing Makefiles to support DEPENDENT_LIBS. r=kai, a=blizzard, b=205444

security/manager/pki/src/Makefile.in

@@ -53,8 +53,8 @@ CPPSRCS = \
 	nsNSSDialogs.cpp \
 	nsPKIModule.cpp \
 	nsPKIParamBlock.cpp \
-  nsASN1Tree.cpp \
-  nsNSSDialogHelper.cpp \
+        nsASN1Tree.cpp \
+        nsNSSDialogHelper.cpp \
 	$(NULL)
 
 REQUIRES	= nspr \
@@ -68,11 +68,9 @@ REQUIRES	= nspr \
 		  necko \
 		  pipnss \
 		  layout \
-      pipboot \
+		  pipboot \
 		  $(NULL)
 
-include $(topsrcdir)/config/rules.mk
-
 INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)
@@ -82,3 +80,5 @@ EXTRA_DSO_LDOPTS += \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
 
+include $(topsrcdir)/config/rules.mk
+

security/manager/ssl/src/Makefile.in

@@ -110,8 +110,6 @@ REQUIRES	= nspr \
 
 EXTRA_DEPS = $(NSS_DEP_LIBS)
 
-include $(topsrcdir)/config/rules.mk
-
 # Use local includes because they are inserted before INCLUDES
 # so that Mozilla's nss.h is used, not glibc's
 LOCAL_INCLUDES += -I$(DIST)/public/nss \
@@ -123,3 +121,6 @@ EXTRA_DSO_LDOPTS += \
 		$(MOZ_JS_LIBS) \
 		$(NSS_LIBS) \
 		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+