Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jmglogow committed May 5, 2020
1 parent 147d3fe commit e1efaec
Show file tree
Hide file tree
Showing 135 changed files with 185 additions and 776 deletions.
12 changes: 6 additions & 6 deletions cmd/crmf-cgi/Makefile
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

This file was deleted.

11 changes: 4 additions & 7 deletions cmd/crmftest/Makefile
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

This file was deleted.

1 change: 0 additions & 1 deletion cmd/lib/Makefile
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

This file was deleted.

1 change: 1 addition & 0 deletions cmd/lib/manifest.mn
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

This file was deleted.

2 changes: 0 additions & 2 deletions cmd/libpkix/perf/Makefile
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
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
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
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix/certsel/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/checker/Makefile
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix/checker/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/crlsel/Makefile
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix/crlsel/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/params/Makefile
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix/params/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/results/Makefile
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix/results/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/store/Makefile
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix/store/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/top/Makefile
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix/top/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix/util/Makefile
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix/util/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix_pl/Makefile
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
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix_pl/module/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix_pl/pki/Makefile
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
3 changes: 2 additions & 1 deletion cmd/libpkix/pkix_pl/pki/manifest.mn
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions cmd/libpkix/pkix_pl/system/Makefile
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
4 changes: 2 additions & 2 deletions cmd/libpkix/pkix_pl/system/manifest.mn
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions cmd/libpkix/testutil/manifest.mn
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
Expand Up @@ -30,8 +30,6 @@ endif
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################

include config.mk

#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
#######################################################################
Expand Down

0 comments on commit e1efaec

Please sign in to comment.