Handle NO_STATIC_LIB being set, when all this file does is create a static library.

content/events/src/Makefile.in

@@ -54,5 +54,9 @@ INCLUDES += -I$(PUBLIC)/dom \
 
 MKSHLIB :=
 
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
 include $(topsrcdir)/config/rules.mk
 

content/html/content/src/Makefile.in

@@ -104,7 +104,8 @@ INCLUDES += -I$(srcdir)/../../style/src -I$(srcdir)/../../../base/src \
 
 MKSLIB :=
 
-# we don't want to build the shared lib
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk

intl/locale/src/Makefile.in

@@ -1,4 +1,3 @@
-#!gmake
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -42,9 +41,8 @@ EXPORTS = \
 	nsLocaleFactory.h	\
 	$(NULL)
 
-#
-# don't need the shared library
-#
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk

layout/base/src/Makefile.in

@@ -77,7 +77,8 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
 MKSHLIB :=
 
-# we don't want the shared lib
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk

layout/events/src/Makefile.in

@@ -54,5 +54,9 @@ INCLUDES += -I$(PUBLIC)/dom \
 
 MKSHLIB :=
 
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
 include $(topsrcdir)/config/rules.mk
 

layout/html/base/src/Makefile.in

@@ -79,8 +79,9 @@ INCLUDES += -I$(srcdir)/../../style/src -I$(srcdir)/../../content/src -I$(srcdir
 
 MKSHLIB :=
 
-# we don't want the shared lib
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 

layout/html/content/src/Makefile.in

@@ -104,7 +104,8 @@ INCLUDES += -I$(srcdir)/../../style/src -I$(srcdir)/../../../base/src \
 
 MKSLIB :=
 
-# we don't want to build the shared lib
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk

rdf/base/src/Makefile.in

@@ -54,7 +54,8 @@ REQUIRES = netlib rdf rdfutil raptor xpcom
 
 MKSHLIB :=
 
-# we don't want the shared lib
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk

rdf/content/src/Makefile.in

@@ -67,8 +67,9 @@ INCLUDES += -I$(srcdir)/../../../layout/html/base/src
 
 MKSHLIB :=
 
-# we don't want the shared lib
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 

rdf/datasource/src/Makefile.in

@@ -50,9 +50,9 @@ INCLUDES += -I$(srcdir)/../../base/src
 
 MKSHLIB :=
 
-# we don't want the shared lib
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
-

rdf/util/src/Makefile.in

@@ -42,7 +42,8 @@ REQUIRES = xpcom rdf rdfutil raptor
 
 MKSHLIB :=
 
-# we don't want the shared lib
-NO_SHARED_LIB=1
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk