зеркало из https://github.com/mozilla/gecko-dev.git
Fix for bug 319495 . Clean up Makefiles for command-line tools. r=nelson
This commit is contained in:
julien.pierre.bugs%sun.com
Родитель
19a40b2ba3
Коммит
0e9451eaef
|
|
@ -46,145 +46,12 @@ ifndef USE_SYSTEM_ZLIB
|
|||
ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS.
|
||||
endif
|
||||
|
||||
# These sources were once in this directory, but now are gone.
|
||||
MISSING_SOURCES = \
|
||||
addcert.c \
|
||||
berparse.c \
|
||||
cert.c \
|
||||
key.c \
|
||||
key_rand.c \
|
||||
keygen.c \
|
||||
sec_fe.c \
|
||||
sec_read.c \
|
||||
secarb.c \
|
||||
secutil.c \
|
||||
$(NULL)
|
||||
|
||||
# we don't build these any more, but the sources are still here
|
||||
OBSOLETE = \
|
||||
berdec.c \
|
||||
berdump.c \
|
||||
cypher.c \
|
||||
dumpcert.c \
|
||||
listcerts.c \
|
||||
mkdongle.c \
|
||||
p12exprt.c \
|
||||
p12imprt.c \
|
||||
rc4.c \
|
||||
sign.c \
|
||||
unwrap.c \
|
||||
vector.c \
|
||||
verify.c \
|
||||
wrap.c \
|
||||
$(NULL)
|
||||
|
||||
# the base files for the executables
|
||||
# hey -- keep these alphabetical, please
|
||||
EXEC_SRCS = \
|
||||
$(NULL)
|
||||
|
||||
# files that generate two separate objects and executables
|
||||
# BI_SRCS = \
|
||||
# keyutil.c \
|
||||
# p7env.c \
|
||||
# tstclnt.c \
|
||||
# $(NULL)
|
||||
|
||||
# -I$(CORE_DEPTH)/security/lib/cert \
|
||||
# -I$(CORE_DEPTH)/security/lib/key \
|
||||
# -I$(CORE_DEPTH)/security/lib/util \
|
||||
|
||||
INCLUDES += \
|
||||
-I$(DIST)/../public/security \
|
||||
-I./include \
|
||||
$(NULL)
|
||||
|
||||
TBD_DIRS = rsh rshd rdist ssld
|
||||
|
||||
# For the time being, sec stuff is export only
|
||||
# US_FLAGS = -DEXPORT_VERSION -DUS_VERSION
|
||||
|
||||
US_FLAGS = -DEXPORT_VERSION
|
||||
EXPORT_FLAGS = -DEXPORT_VERSION
|
||||
|
||||
BASE_LIBS = \
|
||||
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxp.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnspr.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
# $(DIST)/lib/libpurenspr.$(LIB_SUFFIX) \
|
||||
|
||||
#There is a circular dependancy in security/lib, and here is a gross fix
|
||||
SEC_LIBS = \
|
||||
$(DIST)/lib/libsecnav.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libssl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcert.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libkey.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsecmod.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcrypto.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libssl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcert.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libkey.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsecmod.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcrypto.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libhash.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
MYLIB = lib/$(OBJDIR)/libsectool.$(LIB_SUFFIX)
|
||||
|
||||
US_LIBS = $(MYLIB) $(SEC_LIBS) $(BASE_LIBS) $(MYLIB) $(BASE_LIBS)
|
||||
EX_LIBS = $(MYLIB) $(SEC_LIBS) $(BASE_LIBS) $(MYLIB) $(BASE_LIBS)
|
||||
|
||||
REQUIRES = libxp nspr security
|
||||
|
||||
CSRCS = $(EXEC_SRCS) $(BI_SRCS)
|
||||
|
||||
OBJS = $(CSRCS:.c=.o) $(BI_SRCS:.c=-us.o) $(BI_SRCS:.c=-ex.o)
|
||||
|
||||
PROGS = $(addprefix $(OBJDIR)/, $(EXEC_SRCS:.c=$(BIN_SUFFIX)))
|
||||
US_PROGS = $(addprefix $(OBJDIR)/, $(BI_SRCS:.c=-us$(BIN_SUFFIX)))
|
||||
EX_PROGS = $(addprefix $(OBJDIR)/, $(BI_SRCS:.c=-ex$(BIN_SUFFIX)))
|
||||
|
||||
|
||||
NON_DIRS = $(PROGS) $(US_PROGS) $(EX_PROGS)
|
||||
TARGETS = $(NON_DIRS)
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
|
||||
|
||||
ifneq ($(OS_TARGET),OS2)
|
||||
$(OBJDIR)/%-us.o: %.c
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCF) -o $@ $(US_FLAGS) -c $*.c
|
||||
|
||||
$(OBJDIR)/%-ex.o: %.c
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCF) -o $@ $(EXPORT_FLAGS) -c $*.c
|
||||
|
||||
$(OBJDIR)/%.o: %.c
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCF) -o $@ $(EXPORT_FLAGS) -c $*.c
|
||||
|
||||
$(US_PROGS):$(OBJDIR)/%-us: $(OBJDIR)/%-us.o $(US_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCF) -o $@ $(OBJDIR)/$*-us.o $(LDFLAGS) $(US_LIBS) $(OS_LIBS)
|
||||
|
||||
$(EX_PROGS):$(OBJDIR)/%-ex: $(OBJDIR)/%-ex.o $(EX_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCF) -o $@ $(OBJDIR)/$*-ex.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
|
||||
|
||||
$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCF) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
|
||||
|
||||
#install:: $(TARGETS)
|
||||
# $(INSTALL) $(TARGETS) $(DIST)/bin
|
||||
endif
|
||||
|
||||
symbols::
|
||||
@echo "TARGETS = $(TARGETS)"
|
||||
|
|
|
|||
|
|
@ -62,16 +62,6 @@ ifdef XP_OS2_VACPP
|
|||
CFLAGS += -I../modutil
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out WINNT WIN95 WIN16,$(OS_TARGET))) # omits WINCE
|
||||
ifndef BUILD_OPT
|
||||
ifndef NS_USE_GCC
|
||||
LDFLAGS += /subsystem:console /profile /debug /machine:I386 /incremental:no
|
||||
endif
|
||||
OS_CFLAGS += -D_CONSOLE
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
|
|
|||
|
|
@ -57,16 +57,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
#######################################################################
|
||||
include ../platlibs.mk
|
||||
|
||||
ifeq (,$(filter-out WINNT WIN95 WIN16,$(OS_TARGET))) #omits WINCE
|
||||
ifndef BUILD_OPT
|
||||
ifndef NS_USE_GCC
|
||||
LDFLAGS += /subsystem:console /profile /debug /machine:I386 /incremental:no
|
||||
endif
|
||||
OS_CFLAGS += -D_CONSOLE
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
|
|
|||
|
|
@ -86,11 +86,13 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
include ../platrules.mk
|
||||
|
||||
SRCDIR = $(call abspath,.)
|
||||
|
||||
%.chk: %.$(DLL_SUFFIX)
|
||||
ifeq ($(OS_TARGET), OS2)
|
||||
cmd.exe /c sign.cmd $(DIST) $(OBJDIR) $(OS_TARGET) $(NSPR_LIB_DIR) $<
|
||||
cd $(OBJDIR) ; cmd.exe /c $(SRCDIR)/sign.cmd $(DIST) $(call abspath,$(OBJDIR)) $(OS_TARGET) $(call abspath,$(NSPR_LIB_DIR)) $(call abspath,$<)
|
||||
else
|
||||
sh ./sign.sh $(DIST) $(OBJDIR) $(OS_TARGET) $(NSPR_LIB_DIR) $<
|
||||
cd $(OBJDIR) ; sh $(SRCDIR)/sign.sh $(call abspath,$(DIST)) $(call abspath,$(OBJDIR)) $(OS_TARGET) $(call abspath,$(NSPR_LIB_DIR)) $(call abspath,$<)
|
||||
endif
|
||||
|
||||
libs install :: $(CHECKLOC)
|
||||
|
|
|
|||
|
|
@ -58,16 +58,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
|
||||
include ../platlibs.mk
|
||||
|
||||
ifeq (,$(filter-out WINNT WIN95 WIN16,$(OS_TARGET))) # omits WINCE
|
||||
ifndef BUILD_OPT
|
||||
ifndef NS_USE_GCC
|
||||
LDFLAGS += /subsystem:console /profile /debug /machine:I386 /incremental:no
|
||||
endif
|
||||
OS_CFLAGS += -D_CONSOLE
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
|
|
|||
|
|
@ -58,14 +58,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
|
||||
include ../platlibs.mk
|
||||
|
||||
ifeq (,$(filter-out WINNT WIN95 WIN16,$(OS_TARGET))) # omits WINCE
|
||||
ifndef BUILD_OPT
|
||||
LDFLAGS += /subsystem:console /profile /debug /machine:I386 /incremental:no
|
||||
OS_CFLAGS += -D_CONSOLE
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
|
|
|||
|
|
@ -58,16 +58,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|||
|
||||
include ../platlibs.mk
|
||||
|
||||
ifeq (,$(filter-out WINNT WIN95 WIN16,$(OS_TARGET))) # omits WINCE
|
||||
ifndef BUILD_OPT
|
||||
ifndef NS_USE_GCC
|
||||
LDFLAGS += /subsystem:console /profile /debug /machine:I386 /incremental:no
|
||||
endif
|
||||
OS_CFLAGS += -D_CONSOLE
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче