From: Corey Farrell <git@cfware.com>
Date: Tue, 24 Jul 2018 19:28:04 +0000 (-0400)
Subject: Build System: Fix bundled jansson install.
X-Git-Tag: 15.6.0-rc1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0c0e16fd7d02f44939d2f88f19c3e7a70092a91;p=thirdparty%2Fasterisk.git

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
---

diff --git a/third-party/jansson/Makefile b/third-party/jansson/Makefile
index a85efa0c6b..2d9ef53d20 100644
--- a/third-party/jansson/Makefile
+++ b/third-party/jansson/Makefile
@@ -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: