Navigation Menu

Skip to content

Commit

Permalink
Bug 1629553 Merge simple config.mk files r=rrelyea
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@jmglogow
jmglogow committed May 5, 2020
1 parent 147d3fe commit e1efaec
Show file tree
Hide file tree
Showing 135 changed files with 174 additions and 765 deletions.
12 changes: 6 additions & 6 deletions cmd/crmf-cgi/Makefile
View file
Expand Up @@ -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

#######################################################################
Expand All @@ -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). #
Expand Down
16 changes: 0 additions & 16 deletions cmd/crmf-cgi/config.mk
View file

This file was deleted.

11 changes: 4 additions & 7 deletions cmd/crmftest/Makefile
View file
Expand Up @@ -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
Expand All @@ -37,6 +30,10 @@ endif

EXTRA_LIBS += $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)

#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################

include ../platlibs.mk

#######################################################################
Expand Down
15 changes: 0 additions & 15 deletions cmd/crmftest/config.mk
View file

This file was deleted.

1 change: 0 additions & 1 deletion cmd/lib/Makefile
View file
Expand Up @@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################

include config.mk
include ../platlibs.mk

#######################################################################
Expand Down
15 changes: 0 additions & 15 deletions cmd/lib/config.mk
View file

This file was deleted.

1 change: 1 addition & 0 deletions cmd/lib/manifest.mn
View file
Expand Up @@ -5,6 +5,7 @@
CORE_DEPTH = ../..

LIBRARY_NAME = sectool
SHARED_LIBRARY = $(NULL)

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
9 changes: 0 additions & 9 deletions cmd/libpkix/config.mk
View file

This file was deleted.

2 changes: 0 additions & 2 deletions cmd/libpkix/perf/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/perf/manifest.mn
View file
Expand Up @@ -15,6 +15,7 @@ CSRCS = libpkix_buildthreads.c \
$(NULL)

LIBRARY_NAME = pkixtoolperf
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/certsel/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix/certsel/manifest.mn
View file
Expand Up @@ -15,6 +15,7 @@ CSRCS = test_certselector.c \
$(NULL)

LIBRARY_NAME = pkixtoolcertsel
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/checker/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix/checker/manifest.mn
View file
Expand Up @@ -13,6 +13,7 @@ MODULE = nss
CSRCS = test_certchainchecker.c

LIBRARY_NAME = pkixtoolchecker
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/crlsel/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix/crlsel/manifest.mn
View file
Expand Up @@ -15,6 +15,7 @@ CSRCS = test_crlselector.c \
$(NULL)

LIBRARY_NAME = pkixtoolcrlsel
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/params/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix/params/manifest.mn
View file
Expand Up @@ -17,6 +17,7 @@ CSRCS = test_procparams.c \
$(NULL)

LIBRARY_NAME = pkixtoolparams
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/results/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix/results/manifest.mn
View file
Expand Up @@ -17,6 +17,7 @@ CSRCS = test_buildresult.c \
$(NULL)

LIBRARY_NAME = pkixtoolresults
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/store/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix/store/manifest.mn
View file
Expand Up @@ -13,6 +13,7 @@ MODULE = nss
CSRCS = test_store.c

LIBRARY_NAME = pkixtoolstore
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/top/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix/top/manifest.mn
View file
Expand Up @@ -27,6 +27,7 @@ CSRCS = test_basicchecker.c \
$(NULL)

LIBRARY_NAME = pkixtooltop
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/util/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix/util/manifest.mn
View file
Expand Up @@ -17,6 +17,7 @@ CSRCS = test_error.c \
$(NULL)

LIBRARY_NAME = pkixtoolutil
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix_pl/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix_pl/module/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix_pl/module/manifest.mn
View file
Expand Up @@ -18,6 +18,7 @@ CSRCS = test_colcertstore.c \
$(NULL)

LIBRARY_NAME = pkixtoolmodule
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix_pl/pki/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/pkix_pl/pki/manifest.mn
View file
Expand Up @@ -22,6 +22,7 @@ CSRCS = test_cert.c \
$(NULL)

LIBRARY_NAME = pkixtoolpki
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix_pl/system/Makefile
View file
Expand Up @@ -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). #
#######################################################################
Expand Down
2 changes: 1 addition & 1 deletion cmd/libpkix/pkix_pl/system/manifest.mn
View file
Expand Up @@ -30,8 +30,8 @@ CSRCS = test_bigint.c \
test_string2.c \
$(NULL)


LIBRARY_NAME = pkixtoolsys
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)

Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/testutil/manifest.mn
View file
Expand Up @@ -20,6 +20,7 @@ CSRCS = \
$(NULL)

LIBRARY_NAME = pkixtooltestutil
SHARED_LIBRARY = $(NULL)

SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)

Expand Down
2 changes: 0 additions & 2 deletions cpputil/Makefile
View file
Expand Up @@ -30,8 +30,6 @@ endif
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################

include config.mk

#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
#######################################################################
Expand Down
15 changes: 0 additions & 15 deletions cpputil/config.mk
View file

This file was deleted.

2 changes: 2 additions & 0 deletions cpputil/manifest.mn
View file
Expand Up @@ -6,7 +6,9 @@ CORE_DEPTH = ..
DEPTH = ..

MODULE = nss

LIBRARY_NAME = cpputil
SHARED_LIBRARY = $(NULL)

ifeq ($(NSS_BUILD_UTIL_ONLY),1)
CPPSRCS = \
Expand Down

0 comments on commit e1efaec

Please sign in to comment.