зеркало из https://github.com/mozilla/pjs.git
Bug 177387: Put the configuration/assignments before the rules in Makefile.
Define MD_LIB_RELEASE_FILES in manifest.mn so that the *.chk files are included in the mdbinary.jar files generated by the release target.
This commit is contained in:
Родитель
6d2419f541
Коммит
7870b01f6d
|
@ -54,36 +54,12 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
|
||||
include ../platlibs.mk
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
|
||||
#######################################################################
|
||||
# (6) Execute "component" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
|
||||
include ../platrules.mk
|
||||
|
||||
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
|
||||
IS_WINDOWS="YES"
|
||||
else
|
||||
IS_WINDOWS="NO"
|
||||
endif
|
||||
|
||||
|
||||
|
||||
%.chk: %.$(DLL_SUFFIX)
|
||||
@sh ./sign.sh $(DIST) $(OBJDIR) $(IS_WINDOWS) $<
|
||||
|
||||
#
|
||||
# we really should have this driven from a list file made during the normal
|
||||
# NSS build prodecure.
|
||||
|
@ -108,5 +84,28 @@ endif
|
|||
CHECKLOC=$(addprefix $(DIST)/lib/$(LIB_PREFIX), $(CHECKFILES))
|
||||
|
||||
ALL_TRASH += $(CHECKLOC)
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
|
||||
#######################################################################
|
||||
# (6) Execute "component" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
|
||||
include ../platrules.mk
|
||||
|
||||
%.chk: %.$(DLL_SUFFIX)
|
||||
@sh ./sign.sh $(DIST) $(OBJDIR) $(IS_WINDOWS) $<
|
||||
|
||||
libs install :: $(CHECKLOC)
|
||||
|
||||
|
|
|
@ -44,6 +44,8 @@ CSRCS = \
|
|||
|
||||
CHECKFILES = softokn3.chk
|
||||
|
||||
MD_LIB_RELEASE_FILES = $(CHECKLOC)
|
||||
|
||||
# headers for the MODULE (defined above) are implicitly required.
|
||||
REQUIRES = dbm seccmd
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче