Commit e1efaec4 authored by Jan-Marek Glogowski's avatar Jan-Marek Glogowski

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

--HG--
extra : moz-landing-system : lando
parent 147d3feb
......@@ -7,11 +7,7 @@
#######################################################################
# (1) Include initial platform-independent assignments (MANDATORY). #
#######################################################################
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
EXTRA_LIBS += $(DIST)/lib/crmf.lib
else
EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX)
endif
include manifest.mn
#######################################################################
......@@ -24,7 +20,11 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
EXTRA_LIBS += $(DIST)/lib/crmf.lib
else
EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX)
endif
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
......
#
# 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 = $(PROGRAM)
SHARED_LIBRARY =
IMPORT_LIBRARY =
LIBRARY =
......@@ -20,13 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
include config.mk
ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
OS_LIBS += -lsvld
endif
......@@ -37,6 +30,10 @@ endif
EXTRA_LIBS += $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
include ../platlibs.mk
#######################################################################
......
#
# 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 = $(PROGRAM)
SHARED_LIBRARY =
IMPORT_LIBRARY =
LIBRARY =
......@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
include config.mk
include ../platlibs.mk
#######################################################################
......
#
# 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 =
......@@ -5,6 +5,7 @@
CORE_DEPTH = ../..
LIBRARY_NAME = sectool
SHARED_LIBRARY = $(NULL)
# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
......
#
# 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/.
TARGETS = $(LIBRARY)
SHARED_LIBRARY =
IMPORT_LIBRARY =
PROGRAM =
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -15,6 +15,7 @@ CSRCS = libpkix_buildthreads.c \
$(NULL)
LIBRARY_NAME = pkixtoolperf
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -14,7 +14,8 @@ CSRCS = test_certselector.c \
test_comcertselparams.c \
$(NULL)
LIBRARY_NAME=pkixtoolcertsel
LIBRARY_NAME = pkixtoolcertsel
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -12,7 +12,8 @@ MODULE = nss
CSRCS = test_certchainchecker.c
LIBRARY_NAME=pkixtoolchecker
LIBRARY_NAME = pkixtoolchecker
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -14,7 +14,8 @@ CSRCS = test_crlselector.c \
test_comcrlselparams.c \
$(NULL)
LIBRARY_NAME=pkixtoolcrlsel
LIBRARY_NAME = pkixtoolcrlsel
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -16,7 +16,8 @@ CSRCS = test_procparams.c \
test_resourcelimits.c \
$(NULL)
LIBRARY_NAME=pkixtoolparams
LIBRARY_NAME = pkixtoolparams
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -16,7 +16,8 @@ CSRCS = test_buildresult.c \
test_valresult.c \
$(NULL)
LIBRARY_NAME=pkixtoolresults
LIBRARY_NAME = pkixtoolresults
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -12,7 +12,8 @@ MODULE = nss
CSRCS = test_store.c
LIBRARY_NAME=pkixtoolstore
LIBRARY_NAME = pkixtoolstore
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -26,7 +26,8 @@ CSRCS = test_basicchecker.c \
test_validatechain_NB.c \
$(NULL)
LIBRARY_NAME=pkixtooltop
LIBRARY_NAME = pkixtooltop
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -16,7 +16,8 @@ CSRCS = test_error.c \
test_logger.c \
$(NULL)
LIBRARY_NAME=pkixtoolutil
LIBRARY_NAME = pkixtoolutil
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -17,7 +17,8 @@ CSRCS = test_colcertstore.c \
test_httpcertstore.c \
$(NULL)
LIBRARY_NAME=pkixtoolmodule
LIBRARY_NAME = pkixtoolmodule
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -21,7 +21,8 @@ CSRCS = test_cert.c \
test_subjectinfoaccess.c \
$(NULL)
LIBRARY_NAME=pkixtoolpki
LIBRARY_NAME = pkixtoolpki
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
include $(PKIX_DEPTH)/config.mk
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
......
......@@ -30,8 +30,8 @@ CSRCS = test_bigint.c \
test_string2.c \
$(NULL)
LIBRARY_NAME=pkixtoolsys
LIBRARY_NAME = pkixtoolsys
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -20,6 +20,7 @@ CSRCS = \
$(NULL)
LIBRARY_NAME = pkixtooltestutil
SHARED_LIBRARY = $(NULL)
SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)
......
......@@ -30,8 +30,6 @@ endif
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
include config.mk
#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
#######################################################################
......
#
# 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 =
......@@ -6,7 +6,9 @@ CORE_DEPTH = ..
DEPTH = ..
MODULE = nss
LIBRARY_NAME = cpputil
SHARED_LIBRARY = $(NULL)
ifeq ($(NSS_BUILD_UTIL_ONLY),1)
CPPSRCS = \
......
......@@ -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
#
# 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 =
......@@ -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
......@@ -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) #
#######################################################################
......
#
# 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 =
......@@ -35,6 +35,7 @@ CSRCS = \
$(NULL)
LIBRARY_NAME = certdb
SHARED_LIBRARY = $(NULL)
# This part of the code, including all sub-dirs, can be optimized for size
export ALLOW_OPT_CODE_SIZE = 1
......@@ -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) #
#######################################################################
......
#
# 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 =
......@@ -29,6 +29,7 @@ CSRCS = \
$(NULL)
LIBRARY_NAME = certhi
SHARED_LIBRARY = $(NULL)
# This part of the code, including all sub-dirs, can be optimized for size
export ALLOW_OPT_CODE_SIZE = 1
......@@ -4,8 +4,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include manifest.mn
include $(CORE_DEPTH)/coreconf/config.mk
include config.mk
ifdef BUILD_IDG
DEFINES += -DNSSDEBUG
endif
ifdef NOTDEF # was ifdef MOZILLA_CLIENT
NSS_BUILD_CAPI = 1
......
......@@ -5,7 +5,24 @@
include manifest.mn
include $(CORE_DEPTH)/coreconf/config.mk
include config.mk
ifdef BUILD_IDG
DEFINES += -DNSSDEBUG
endif
# Needed for compilation of $(OBJDIR)/certdata.c
INCLUDES += -I.
#
# To create a loadable module on Darwin, we must use -bundle.
#
ifeq ($(OS_TARGET),Darwin)
DSO_LDOPTS = -bundle
endif
ifdef USE_GCOV
DSO_LDOPTS += --coverage
endif
EXTRA_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
......
#
# 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 shared libraries
# are specifed as dependencies within rules.mk.
#
TARGETS = $(SHARED_LIBRARY)
LIBRARY =
IMPORT_LIBRARY =
PROGRAM =
ifdef BUILD_IDG
DEFINES += -DNSSDEBUG
endif
# Needed for compilation of $(OBJDIR)/certdata.c
INCLUDES += -I.
#
# To create a loadable module on Darwin, we must use -bundle.
#
ifeq ($(OS_TARGET),Darwin)
DSO_LDOPTS = -bundle
endif
ifdef USE_GCOV
DSO_LDOPTS += --coverage
endif
......@@ -30,3 +30,5 @@ REQUIRES = nspr
LIBRARY_NAME = nssckbi
MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
LIBRARY = $(NULL)
IMPORT_LIBRARY = $(NULL)
......@@ -4,8 +4,26 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include manifest.mn
include $(CORE_DEPTH)/coreconf/config.mk
include config.mk
ifdef BUILD_IDG
DEFINES += -DNSSDEBUG
endif
# Needed for compilation of $(OBJDIR)/certdata.c
INCLUDES += -I.
#
# To create a loadable module on Darwin, we must use -bundle.
#
ifeq ($(OS_TARGET),Darwin)
DSO_LDOPTS = -bundle
endif
ifdef USE_GCOV
DSO_LDOPTS += --coverage
endif
EXTRA_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
......
#
# 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 shared libraries
# are specifed as dependencies within rules.mk.
#
TARGETS = $(SHARED_LIBRARY)
LIBRARY =
IMPORT_LIBRARY =
PROGRAM =
ifdef BUILD_IDG
DEFINES += -DNSSDEBUG
endif
# Needed for compilation of $(OBJDIR)/certdata.c
INCLUDES += -I.
#
# To create a loadable module on Darwin, we must use -bundle.
#
ifeq ($(OS_TARGET),Darwin)
DSO_LDOPTS = -bundle
endif
ifdef USE_GCOV
DSO_LDOPTS += --coverage
endif
......@@ -23,3 +23,4 @@ CSRCS = \
REQUIRES = nspr
LIBRARY_NAME = nssckbi-testlib
LIBRARY = $(NULL)
......@@ -5,7 +5,17 @@
include manifest.mn
include $(CORE_DEPTH)/coreconf/config.mk
include config.mk
ifdef BUILD_IDG
DEFINES += -DNSSDEBUG
endif
#
# To create a loadable module on Darwin, we must use -bundle.
#
ifeq ($(OS_TARGET),Darwin)
DSO_LDOPTS = -bundle
endif
EXTRA_LIBS = \