lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-21 14:00:51 +03:00
Code Activity

Makefile.mk: drop PROOT variable [ci skip]

Browse Source
This commit is contained in:
Viktor Szakats
2023-04-07 23:50:57 +00:00
parent 59666e03f0
commit bc0cd58e87
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Makefile.mk
View File

@@ -9,8 +9,6 @@
# #
######################################################################### #########################################################################
PROOT := .
### Common ### Common
CFLAGS ?= CFLAGS ?=
@@ -47,7 +45,7 @@ else
TRIPLET ?= $(shell $(CC) -dumpmachine) TRIPLET ?= $(shell $(CC) -dumpmachine)
endif endif
BLD_DIR ?= $(PROOT)/$(TRIPLET) BLD_DIR ?= $(TRIPLET)
ifneq ($(findstring -w,$(TRIPLET)),) ifneq ($(findstring -w,$(TRIPLET)),)
WIN32 := 1 WIN32 := 1
@@ -57,8 +55,8 @@ else
CPPFLAGS += -I$(BLD_DIR) -DHAVE_CONFIG_H CPPFLAGS += -I$(BLD_DIR) -DHAVE_CONFIG_H
endif endif
CPPFLAGS += -I$(PROOT)/src -I$(PROOT)/include CPPFLAGS += -Isrc -Iinclude
RCFLAGS += -I$(PROOT)/include RCFLAGS += -Iinclude
# examples, tests # examples, tests
@@ -107,29 +105,29 @@ ifdef OPENSSL_PATH
_LDFLAGS += -L"$(OPENSSL_LIBPATH)" _LDFLAGS += -L"$(OPENSSL_LIBPATH)"
OPENSSL_LIBS ?= -lssl -lcrypto OPENSSL_LIBS ?= -lssl -lcrypto
_LIBS += $(OPENSSL_LIBS) _LIBS += $(OPENSSL_LIBS)
include $(PROOT)/Makefile.OpenSSL.inc include Makefile.OpenSSL.inc
else ifdef WOLFSSL_PATH else ifdef WOLFSSL_PATH
CPPFLAGS += -DLIBSSH2_WOLFSSL CPPFLAGS += -DLIBSSH2_WOLFSSL
CPPFLAGS += -I"$(WOLFSSL_PATH)/include" CPPFLAGS += -I"$(WOLFSSL_PATH)/include"
CPPFLAGS += -I"$(WOLFSSL_PATH)/include/wolfssl" CPPFLAGS += -I"$(WOLFSSL_PATH)/include/wolfssl"
_LDFLAGS += -L"$(WOLFSSL_PATH)/lib" _LDFLAGS += -L"$(WOLFSSL_PATH)/lib"
_LIBS += -lwolfssl _LIBS += -lwolfssl
include $(PROOT)/Makefile.wolfSSL.inc include Makefile.wolfSSL.inc
else ifdef LIBGCRYPT_PATH else ifdef LIBGCRYPT_PATH
CPPFLAGS += -DLIBSSH2_LIBGCRYPT CPPFLAGS += -DLIBSSH2_LIBGCRYPT
CPPFLAGS += -I"$(LIBGCRYPT_PATH)/include" CPPFLAGS += -I"$(LIBGCRYPT_PATH)/include"
_LDFLAGS += -L"$(LIBGCRYPT_PATH)/lib" _LDFLAGS += -L"$(LIBGCRYPT_PATH)/lib"
_LIBS += -lgcrypt _LIBS += -lgcrypt
include $(PROOT)/Makefile.libgcrypt.inc include Makefile.libgcrypt.inc
else ifdef MBEDTLS_PATH else ifdef MBEDTLS_PATH
CPPFLAGS += -DLIBSSH2_MBEDTLS CPPFLAGS += -DLIBSSH2_MBEDTLS
CPPFLAGS += -I"$(MBEDTLS_PATH)/include" CPPFLAGS += -I"$(MBEDTLS_PATH)/include"
_LDFLAGS += -L"$(MBEDTLS_PATH)/lib" _LDFLAGS += -L"$(MBEDTLS_PATH)/lib"
_LIBS += -lmbedtls -lmbedx509 -lmbedcrypto _LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
include $(PROOT)/Makefile.mbedTLS.inc include Makefile.mbedTLS.inc
else ifdef WIN32 else ifdef WIN32
CPPFLAGS += -DLIBSSH2_WINCNG CPPFLAGS += -DLIBSSH2_WINCNG
include $(PROOT)/Makefile.WinCNG.inc include Makefile.WinCNG.inc
else else
$(error No suitable cryptography backend found) $(error No suitable cryptography backend found)
endif endif
@@ -174,13 +172,13 @@ ZIP := zip -qzr9
# Include the version info retrieved from libssh2.h # Include the version info retrieved from libssh2.h
-include $(OBJ_DIR)/version.inc -include $(OBJ_DIR)/version.inc
vpath %.c $(PROOT)/src vpath %.c src
ifdef WIN32 ifdef WIN32
vpath %.rc $(PROOT)/src vpath %.rc src
endif endif
# include Makefile.inc to get CSOURCES define # include Makefile.inc to get CSOURCES define
include $(PROOT)/Makefile.inc include Makefile.inc
OBJS := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(CSOURCES))) OBJS := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(CSOURCES)))
@@ -201,7 +199,7 @@ ifdef WIN32
LIBSSH2_LDFLAGS_DYN += -Wl,--output-def,$(libssh2_def_LIBRARY),--out-implib,$(libssh2_dyn_a_LIBRARY) LIBSSH2_LDFLAGS_DYN += -Wl,--output-def,$(libssh2_def_LIBRARY),--out-implib,$(libssh2_dyn_a_LIBRARY)
endif endif
TARGETS_EXAMPLES := $(patsubst %.c,%$(BIN_EXT),$(strip $(wildcard $(PROOT)/example/*.c))) TARGETS_EXAMPLES := $(patsubst %.c,%$(BIN_EXT),$(strip $(wildcard example/*.c)))
all: lib dyn all: lib dyn
@@ -218,12 +216,12 @@ example: $(TARGETS_EXAMPLES)
TARGETS_RUNNER := $(TARGET)-runner.a TARGETS_RUNNER := $(TARGET)-runner.a
TARGETS_RUNNER_OBJS := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,runner.c session_fixture.c openssh_fixture.c)) TARGETS_RUNNER_OBJS := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,runner.c session_fixture.c openssh_fixture.c))
TARGETS_TESTS := $(patsubst %.c,%$(BIN_EXT),$(strip $(wildcard $(PROOT)/tests/test_*.c))) TARGETS_TESTS := $(patsubst %.c,%$(BIN_EXT),$(strip $(wildcard tests/test_*.c)))
test: $(TARGETS_RUNNER) $(TARGETS_TESTS) test: $(TARGETS_RUNNER) $(TARGETS_TESTS)
$(TARGETS_RUNNER_OBJS): $(TARGETS_RUNNER_OBJS):
$(CC) -W -Wall $(CFLAGS) $(CPPFLAGS) -c $(patsubst $(OBJ_DIR)/%.o,$(PROOT)/tests/%.c,$@) -o $@ $(CC) -W -Wall $(CFLAGS) $(CPPFLAGS) -c $(patsubst $(OBJ_DIR)/%.o,tests/%.c,$@) -o $@
$(TARGETS_RUNNER): $(TARGETS_RUNNER_OBJS) $(TARGETS_RUNNER): $(TARGETS_RUNNER_OBJS)
@$(call DEL, $@) @$(call DEL, $@)
@@ -252,17 +250,17 @@ $(TARGET).a: $(OBJS)
@$(call DEL, $@) @$(call DEL, $@)
$(AR) rcs $@ $^ $(AR) rcs $@ $^
$(OBJ_DIR)/version.inc: $(PROOT)/get_ver.awk $(PROOT)/include/libssh2.h $(OBJ_DIR) $(OBJ_DIR)/version.inc: get_ver.awk include/libssh2.h $(OBJ_DIR)
$(AWK) -f $^ > $@ $(AWK) -f $^ > $@
dist: all $(DISTDIR) $(DISTDIR)/readme.txt dist: all $(DISTDIR) $(DISTDIR)/readme.txt
@$(call MKDIR, $(DISTDIR)/bin) @$(call MKDIR, $(DISTDIR)/bin)
@$(call MKDIR, $(DISTDIR)/include) @$(call MKDIR, $(DISTDIR)/include)
@$(call MKDIR, $(DISTDIR)/lib) @$(call MKDIR, $(DISTDIR)/lib)
@$(call COPY, $(PROOT)/COPYING, $(DISTDIR)) @$(call COPY, COPYING, $(DISTDIR))
@$(call COPY, $(PROOT)/README, $(DISTDIR)) @$(call COPY, README, $(DISTDIR))
@$(call COPY, $(PROOT)/RELEASE-NOTES, $(DISTDIR)) @$(call COPY, RELEASE-NOTES, $(DISTDIR))
@$(call COPY, $(PROOT)/include/*.h, $(DISTDIR)/include) @$(call COPY, include/*.h, $(DISTDIR)/include)
@$(call COPY, $(TARGET).a, $(DISTDIR)/lib) @$(call COPY, $(TARGET).a, $(DISTDIR)/lib)
ifdef WIN32 ifdef WIN32
@$(call COPY, $(libssh2_def_LIBRARY), $(DISTDIR)/bin) @$(call COPY, $(libssh2_def_LIBRARY), $(DISTDIR)/bin)