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/libpkix | |
| 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/libpkix')
41 files changed, 31 insertions, 273 deletions
diff --git a/lib/libpkix/Makefile b/lib/libpkix/Makefile index c3cb5ef8b..bb8877285 100755 --- a/lib/libpkix/Makefile +++ b/lib/libpkix/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/libpkix/config.mk b/lib/libpkix/config.mk deleted file mode 100755 index 5d75e1c04..000000000 --- a/lib/libpkix/config.mk +++ /dev/null @@ -1,16 +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. -# -# DEFINES+=-DPKIX_LISTDEBUG Can be used to turn on debug compilation - -TARGETS = $(LIBRARY) -SHARED_LIBRARY = -IMPORT_LIBRARY = -PROGRAM = - diff --git a/lib/libpkix/include/Makefile b/lib/libpkix/include/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/include/Makefile +++ b/lib/libpkix/include/Makefile @@ -26,7 +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/libpkix/include/config.mk b/lib/libpkix/include/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/include/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/libpkix/pkix/Makefile b/lib/libpkix/pkix/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/pkix/Makefile +++ b/lib/libpkix/pkix/Makefile @@ -26,7 +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/libpkix/pkix/certsel/Makefile b/lib/libpkix/pkix/certsel/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/pkix/certsel/Makefile +++ b/lib/libpkix/pkix/certsel/Makefile @@ -26,7 +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/libpkix/pkix/certsel/config.mk b/lib/libpkix/pkix/certsel/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/certsel/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/libpkix/pkix/certsel/manifest.mn b/lib/libpkix/pkix/certsel/manifest.mn index 8e28df585..eb434bd53 100755 --- a/lib/libpkix/pkix/certsel/manifest.mn +++ b/lib/libpkix/pkix/certsel/manifest.mn @@ -17,4 +17,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixcertsel - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix/checker/Makefile b/lib/libpkix/pkix/checker/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/pkix/checker/Makefile +++ b/lib/libpkix/pkix/checker/Makefile @@ -26,7 +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/libpkix/pkix/checker/config.mk b/lib/libpkix/pkix/checker/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/checker/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/libpkix/pkix/checker/manifest.mn b/lib/libpkix/pkix/checker/manifest.mn index da99416fa..84a372cea 100755 --- a/lib/libpkix/pkix/checker/manifest.mn +++ b/lib/libpkix/pkix/checker/manifest.mn @@ -39,4 +39,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixchecker - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix/config.mk b/lib/libpkix/pkix/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/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/libpkix/pkix/crlsel/Makefile b/lib/libpkix/pkix/crlsel/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/pkix/crlsel/Makefile +++ b/lib/libpkix/pkix/crlsel/Makefile @@ -26,7 +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/libpkix/pkix/crlsel/config.mk b/lib/libpkix/pkix/crlsel/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/crlsel/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/libpkix/pkix/crlsel/manifest.mn b/lib/libpkix/pkix/crlsel/manifest.mn index 0ad81055e..fe84a2d62 100755 --- a/lib/libpkix/pkix/crlsel/manifest.mn +++ b/lib/libpkix/pkix/crlsel/manifest.mn @@ -17,4 +17,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixcrlsel - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix/params/Makefile b/lib/libpkix/pkix/params/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/pkix/params/Makefile +++ b/lib/libpkix/pkix/params/Makefile @@ -26,7 +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/libpkix/pkix/params/config.mk b/lib/libpkix/pkix/params/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/params/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/libpkix/pkix/params/manifest.mn b/lib/libpkix/pkix/params/manifest.mn index 604f21f54..2a77bf0ee 100755 --- a/lib/libpkix/pkix/params/manifest.mn +++ b/lib/libpkix/pkix/params/manifest.mn @@ -21,4 +21,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixparams - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix/results/Makefile b/lib/libpkix/pkix/results/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/pkix/results/Makefile +++ b/lib/libpkix/pkix/results/Makefile @@ -26,7 +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/libpkix/pkix/results/config.mk b/lib/libpkix/pkix/results/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/results/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/libpkix/pkix/results/manifest.mn b/lib/libpkix/pkix/results/manifest.mn index 07bb22e5d..bec0270fb 100755 --- a/lib/libpkix/pkix/results/manifest.mn +++ b/lib/libpkix/pkix/results/manifest.mn @@ -21,4 +21,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixresults - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix/store/Makefile b/lib/libpkix/pkix/store/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/pkix/store/Makefile +++ b/lib/libpkix/pkix/store/Makefile @@ -26,7 +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/libpkix/pkix/store/config.mk b/lib/libpkix/pkix/store/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/store/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/libpkix/pkix/store/manifest.mn b/lib/libpkix/pkix/store/manifest.mn index cb64455f8..53a54d6cc 100755 --- a/lib/libpkix/pkix/store/manifest.mn +++ b/lib/libpkix/pkix/store/manifest.mn @@ -15,4 +15,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixstore - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix/top/Makefile b/lib/libpkix/pkix/top/Makefile index c3cb5ef8b..d714361be 100755 --- a/lib/libpkix/pkix/top/Makefile +++ b/lib/libpkix/pkix/top/Makefile @@ -26,7 +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/libpkix/pkix/top/config.mk b/lib/libpkix/pkix/top/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/top/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/libpkix/pkix/top/manifest.mn b/lib/libpkix/pkix/top/manifest.mn index 8ba169d69..5bdd3f300 100755 --- a/lib/libpkix/pkix/top/manifest.mn +++ b/lib/libpkix/pkix/top/manifest.mn @@ -19,4 +19,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixtop - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix/util/Makefile b/lib/libpkix/pkix/util/Makefile index 1b75ee75a..2b5492506 100755 --- a/lib/libpkix/pkix/util/Makefile +++ b/lib/libpkix/pkix/util/Makefile @@ -26,7 +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/libpkix/pkix/util/config.mk b/lib/libpkix/pkix/util/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix/util/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/libpkix/pkix/util/manifest.mn b/lib/libpkix/pkix/util/manifest.mn index f18d94bee..e7d9f973c 100755 --- a/lib/libpkix/pkix/util/manifest.mn +++ b/lib/libpkix/pkix/util/manifest.mn @@ -22,4 +22,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixutil - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix_pl_nss/Makefile b/lib/libpkix/pkix_pl_nss/Makefile index 1b75ee75a..2b5492506 100755 --- a/lib/libpkix/pkix_pl_nss/Makefile +++ b/lib/libpkix/pkix_pl_nss/Makefile @@ -26,7 +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/libpkix/pkix_pl_nss/config.mk b/lib/libpkix/pkix_pl_nss/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix_pl_nss/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/libpkix/pkix_pl_nss/module/Makefile b/lib/libpkix/pkix_pl_nss/module/Makefile index c3cb5ef8b..e97ad8e4d 100755 --- a/lib/libpkix/pkix_pl_nss/module/Makefile +++ b/lib/libpkix/pkix_pl_nss/module/Makefile @@ -26,7 +26,26 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk +ifdef NSS_PKIX_NO_LDAP +LDAP_HEADERS = +LDAP_CSRCS = +else +LDAP_HEADERS = \ + pkix_pl_ldapt.h \ + pkix_pl_ldapcertstore.h \ + pkix_pl_ldapresponse.h \ + pkix_pl_ldaprequest.h \ + pkix_pl_ldapdefaultclient.h \ + $(NULL) + +LDAP_CSRCS = \ + pkix_pl_ldaptemplates.c \ + pkix_pl_ldapcertstore.c \ + pkix_pl_ldapresponse.c \ + pkix_pl_ldaprequest.c \ + pkix_pl_ldapdefaultclient.c \ + $(NULL) +endif ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # diff --git a/lib/libpkix/pkix_pl_nss/module/config.mk b/lib/libpkix/pkix_pl_nss/module/config.mk deleted file mode 100755 index 2926747a2..000000000 --- a/lib/libpkix/pkix_pl_nss/module/config.mk +++ /dev/null @@ -1,35 +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 = - -ifdef NSS_PKIX_NO_LDAP -LDAP_HEADERS = -LDAP_CSRCS = -else -LDAP_HEADERS = \ - pkix_pl_ldapt.h \ - pkix_pl_ldapcertstore.h \ - pkix_pl_ldapresponse.h \ - pkix_pl_ldaprequest.h \ - pkix_pl_ldapdefaultclient.h \ - $(NULL) - -LDAP_CSRCS = \ - pkix_pl_ldaptemplates.c \ - pkix_pl_ldapcertstore.c \ - pkix_pl_ldapresponse.c \ - pkix_pl_ldaprequest.c \ - pkix_pl_ldapdefaultclient.c \ - $(NULL) -endif diff --git a/lib/libpkix/pkix_pl_nss/module/manifest.mn b/lib/libpkix/pkix_pl_nss/module/manifest.mn index 9ae4d915c..31231e4ed 100755 --- a/lib/libpkix/pkix_pl_nss/module/manifest.mn +++ b/lib/libpkix/pkix_pl_nss/module/manifest.mn @@ -31,4 +31,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixmodule - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix_pl_nss/pki/Makefile b/lib/libpkix/pkix_pl_nss/pki/Makefile index a9cebcfec..2b4b1574a 100755 --- a/lib/libpkix/pkix_pl_nss/pki/Makefile +++ b/lib/libpkix/pkix_pl_nss/pki/Makefile @@ -26,7 +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/libpkix/pkix_pl_nss/pki/config.mk b/lib/libpkix/pkix_pl_nss/pki/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix_pl_nss/pki/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/libpkix/pkix_pl_nss/pki/manifest.mn b/lib/libpkix/pkix_pl_nss/pki/manifest.mn index 7e105e7b9..aba1367e5 100755 --- a/lib/libpkix/pkix_pl_nss/pki/manifest.mn +++ b/lib/libpkix/pkix_pl_nss/pki/manifest.mn @@ -47,4 +47,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixpki - +SHARED_LIBRARY = $(NULL) diff --git a/lib/libpkix/pkix_pl_nss/system/Makefile b/lib/libpkix/pkix_pl_nss/system/Makefile index a9cebcfec..2b4b1574a 100755 --- a/lib/libpkix/pkix_pl_nss/system/Makefile +++ b/lib/libpkix/pkix_pl_nss/system/Makefile @@ -26,7 +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/libpkix/pkix_pl_nss/system/config.mk b/lib/libpkix/pkix_pl_nss/system/config.mk deleted file mode 100755 index b8c03de79..000000000 --- a/lib/libpkix/pkix_pl_nss/system/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/libpkix/pkix_pl_nss/system/manifest.mn b/lib/libpkix/pkix_pl_nss/system/manifest.mn index 16cb6d0eb..a143a03ee 100755 --- a/lib/libpkix/pkix_pl_nss/system/manifest.mn +++ b/lib/libpkix/pkix_pl_nss/system/manifest.mn @@ -40,4 +40,4 @@ CSRCS = \ $(NULL) LIBRARY_NAME = pkixsystem - +SHARED_LIBRARY = $(NULL) |