Skip to content
Snippets Groups Projects
Commit ca7e08b0 authored by deuce's avatar deuce
Browse files

Make the CryptLib CFLAGS/LDFLAGS stuff based on if cryptlib is included.

Ensure that the cryptlib dependencies are met before OBJS.
parent e32a13eb
No related branches found
No related tags found
No related merge requests found
SRC_ROOT := ..
include ${SRC_ROOT}/build/Common.gmake
CFLAGS += $(CRYPT_CFLAGS)
ifdef WITHOUT_OOII
CFLAGS += -DWITHOUT_OOII=1
else
......@@ -62,14 +61,14 @@ ifdef WITHOUT_CRYPTLIB
CFLAGS += -DWITHOUT_CRYPTLIB
else
OBJS += $(MTOBJODIR)$(DIRSEP)ssh$(OFILE)
CFLAGS += $(CRYPT_CFLAGS)
EXTRA_LIBS += $(CRYPT_LIB)
endif
ifdef STATIC
STATIC_CRYPTLIB := true
endif
EXTRA_LIBS += $(CRYPT_LIB)
ifeq ($(os),darwin)
ifeq ($(shell uname -r),6.8)
EXTRA_LIBS += /usr/local/lib/libdl.a
......@@ -125,7 +124,7 @@ ifndef bcc
endif
$(SYNCTERM): $(EXEODIR) $(OBJS) $(BUILD_DEPENDS) $(CRYPT_DEPS)
$(SYNCTERM): $(CRYPT_DEPS) $(EXEODIR) $(OBJS) $(BUILD_DEPENDS)
@echo Linking $@
${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) $(OBJS) -o $@ $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(WXLIBS) $(XPDEV-MT_LIBS) $(EXTRA_LIBS)
ifeq ($(os),darwin)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment