diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:31:30 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:31:30 +0000 |
| commit | f129a789c105c7ff2e51db559b51672fd36e511a (patch) | |
| tree | b5130deb320dfa807c4c7ae5f9b0695cf9d85276 /lib/cryptohi | |
| parent | 8d55ac83ed57c82b2784e074751a33fe5e2dc21c (diff) | |
| download | nss-hg-f129a789c105c7ff2e51db559b51672fd36e511a.tar.gz | |
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
Diffstat (limited to 'lib/cryptohi')
| -rw-r--r-- | lib/cryptohi/Makefile | 2 | ||||
| -rw-r--r-- | lib/cryptohi/config.mk | 15 | ||||
| -rw-r--r-- | lib/cryptohi/manifest.mn | 1 |
3 files changed, 1 insertions, 17 deletions
diff --git a/lib/cryptohi/Makefile b/lib/cryptohi/Makefile index c3bb95f00..aae54b1e0 100644 --- a/lib/cryptohi/Makefile +++ b/lib/cryptohi/Makefile @@ -26,8 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### --include config.mk - ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### diff --git a/lib/cryptohi/config.mk b/lib/cryptohi/config.mk deleted file mode 100644 index b8c03de79..000000000 --- a/lib/cryptohi/config.mk +++ /dev/null @@ -1,15 +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/. - -# -# 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/cryptohi/manifest.mn b/lib/cryptohi/manifest.mn index 896c7ad12..6b1a546dd 100644 --- a/lib/cryptohi/manifest.mn +++ b/lib/cryptohi/manifest.mn @@ -9,6 +9,7 @@ MODULE = nss REQUIRES = nssutil LIBRARY_NAME = cryptohi +SHARED_LIBRARY = $(NULL) EXPORTS = \ cryptohi.h \ |