зеркало из https://github.com/mozilla/pjs.git
Update makefiles so NT will build. (and other platforms that don't have symbolic links)
This commit is contained in:
Родитель
a9b894bc1c
Коммит
2551814b35
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ else
|
|||
EXTRA_LIBS += $(DIST)/lib/libcrmf.a
|
||||
endif
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
@ -93,4 +93,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
lame:
|
||||
echo $(CPU_ARCH)
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
|
|
@ -69,7 +69,7 @@ else
|
|||
EXTRA_LIBS += $(DIST)/lib/libcrmf.a
|
||||
endif
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -96,4 +96,4 @@ endif
|
|||
lame:
|
||||
echo $(CPU_ARCH)
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -70,4 +70,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
@ -72,6 +72,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
#######################################################################
|
||||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -70,7 +70,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
installparse.c: installparse.y
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -70,4 +70,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
#######################################################################
|
||||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -70,5 +70,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# Since ssltap doesn't use any of NSS, we'll skip NSS's link libs,
|
||||
# and just link with NSPR.
|
||||
#
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -75,5 +75,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
|
||||
|
||||
-include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
-include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
|
@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../../platlibs.mk
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
@ -72,4 +72,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
#######################################################################
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../../platrules.mk
|
||||
|
|
|
@ -64,7 +64,7 @@ EXTRA_LIBS += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../../platlibs.mk
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
@ -83,5 +83,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../../platrules.mk
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
include ../platlibs.mk
|
||||
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
ifndef BUILD_OPT
|
||||
|
@ -72,11 +72,11 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
# (6) Execute "component" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
||||
#include $(CORE_DEPTH)/security/cmd/platlibs.mk
|
||||
#include ../platlibs.mk
|
||||
|
||||
#######################################################################
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
include $(CORE_DEPTH)/security/cmd/platrules.mk
|
||||
include ../platrules.mk
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче