sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build System: Fix bundled jansson install. 

Update the bundled jansson Makefile to do nothing during Asterisk
install, use a target that is not phony to initiate the jansson make and
install.

Change-Id: I7643cc3d39af9feba8fc0da676b646efc5f8b3bb
This commit is contained in:
Corey Farrell 2018-07-24 15:28:04 -04:00
parent 18a074e540
commit 5537048d60
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
third-party/jansson/Makefile vendored
View File

@ -1,4 +1,4 @@
.PHONY: _all all _install install clean distclean configure
.PHONY: all install clean distclean configure
.NOTPARALLEL:
@ -39,10 +39,9 @@ ifeq ($(SPECIAL_TARGETS),)
$(warning ASTTOPDIR/menuselect hasn't been run yet. Can't find debug options.)
endif
all: _all
install: _install
all: dest/include/jansson.h
else
all install:
all:
endif
endif
@ -53,7 +52,7 @@ include Makefile.rules
ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] '
SHELL_ECHO_PREFIX := echo '[jansson] '
_all: source/config.status
dest/include/jansson.h: source/config.status
$(ECHO_PREFIX) Building bundled jansson.
$(CMD_PREFIX) (cd source; make)
$(CMD_PREFIX) (cd source; make install)
@ -86,8 +85,7 @@ source/config.status: source/.unpacked Makefile.rules .rebuild_needed
configure: source/config.status
_install: _all
install:
uninstall:
clean: