From f129a789c105c7ff2e51db559b51672fd36e511a Mon Sep 17 00:00:00 2001
From: Jan-Marek Glogowski <glogow@fbihome.de>
Date: Tue, 5 May 2020 12:31:30 +0000
Subject: Bug 1629553 Merge simple config.mk files r=rrelyea

There is really no good reason to explicitly change the TARGET
variable. And the empty SHARED_LIBRARY variable should also be
in the manifest.mn to begin with.

All the other empty variables start empty or undefined, so there
is also no need to explicitly set them empty.

Differential Revision: https://phabricator.services.mozilla.com/D70691
---
 lib/base/Makefile    |  8 ++++++--
 lib/base/config.mk   | 19 -------------------
 lib/base/manifest.mn |  1 +
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 lib/base/config.mk

(limited to 'lib/base')

diff --git a/lib/base/Makefile b/lib/base/Makefile
index ca709f6c0..3f49eaa45 100644
--- a/lib/base/Makefile
+++ b/lib/base/Makefile
@@ -4,7 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
-include $(CORE_DEPTH)/coreconf/rules.mk
 
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+include $(CORE_DEPTH)/coreconf/rules.mk
diff --git a/lib/base/config.mk b/lib/base/config.mk
deleted file mode 100644
index 2676cd537..000000000
--- a/lib/base/config.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# 
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/base/manifest.mn b/lib/base/manifest.mn
index da3a0f336..6c4b2db98 100644
--- a/lib/base/manifest.mn
+++ b/lib/base/manifest.mn
@@ -33,6 +33,7 @@ CSRCS =		   \
 REQUIRES = nspr
 
 LIBRARY_NAME = nssb
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
-- 
cgit v1.2.1