mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-15 17:27:02 +00:00
Add libjwt to third-party
The current STIR/SHAKEN implementation is not currently usable due to encryption issues. Rather than trying to futz with OpenSSL and the the current code, we can take advantage of the existing capabilities of libjwt but we first need to add it to the third-party infrastructure already in place for jansson and pjproject. A few tweaks were also made to the third-party infrastructure as a whole. The jansson "dest" install directory was renamed "dist" to better match convention, and the third-party Makefile was updated to clean all product directories not just the ones currently in use. Resolves: #349
This commit is contained in:
committed by
George Joseph
parent
b47200ddf0
commit
15ef050d0a
29
third-party/Makefile
vendored
29
third-party/Makefile
vendored
@@ -2,6 +2,8 @@
|
||||
-include ../makeopts
|
||||
include Makefile.rules
|
||||
|
||||
TP_ALL_SUBDIRS := jansson pjproject libjwt
|
||||
|
||||
TP_SUBDIRS :=
|
||||
# Sub directories that contain special install/uninstall targets must be explicitly listed
|
||||
# to prevent accidentally running the package's default install target.
|
||||
@@ -17,18 +19,31 @@ TP_SUBDIRS += jansson
|
||||
TP_INSTALL_SUBDIRS += jansson
|
||||
endif
|
||||
|
||||
.PHONY: all dist-clean distclean install clean moduleinfo makeopts uninstall $(TP_SUBDIRS)
|
||||
|
||||
ifneq ($(TP_SUBDIRS),)
|
||||
ifeq ($(LIBJWT_BUNDLED),yes)
|
||||
TP_SUBDIRS += libjwt
|
||||
TP_INSTALL_SUBDIRS += libjwt
|
||||
libjwt: jansson
|
||||
export JANSSON_CFLAGS=$(JANSSON_INCLUDE)
|
||||
export JANSSON_LIBS=$(JANSSON_LIB)
|
||||
endif
|
||||
|
||||
override MAKECMDGOALS?=all
|
||||
|
||||
MAKECMDGOALS:=$(subst dist-clean,distclean,$(MAKECMDGOALS))
|
||||
|
||||
all distclean dist-clean install uninstall clean : $(TP_SUBDIRS)
|
||||
install uninstall: $(TP_INSTALL_SUBDIRS)
|
||||
.PHONY: all dist-clean distclean install clean moduleinfo makeopts uninstall $(TP_ALL_SUBDIRS)
|
||||
|
||||
$(TP_SUBDIRS):
|
||||
ifeq ($(findstring clean,$(MAKECMDGOALS)),clean)
|
||||
distclean dist-clean clean : $(TP_ALL_SUBDIRS)
|
||||
TP_RUN_SUBDIRS := $(TP_ALL_SUBDIRS)
|
||||
else
|
||||
all install uninstall : $(TP_SUBDIRS)
|
||||
install uninstall: $(TP_INSTALL_SUBDIRS)
|
||||
TP_RUN_SUBDIRS := $(TP_SUBDIRS)
|
||||
endif
|
||||
|
||||
ifneq ($(TP_RUN_SUBDIRS),)
|
||||
|
||||
$(TP_RUN_SUBDIRS):
|
||||
+$(CMD_PREFIX) $(SUBMAKE) -C $@ $(MAKECMDGOALS)
|
||||
|
||||
endif
|
Reference in New Issue
Block a user