[asterisk-commits] Build System: Fix bundled jansson install. (asterisk[16])

[SVN commits to the Asterisk project]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/9653 )

Change subject: Build System: Fix bundled jansson install.
......................................................................

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
---
M third-party/jansson/Makefile
1 file changed, 5 insertions(+), 7 deletions(-)

Approvals:
  Jenkins2: Looks good to me, approved; Approved for Submit



diff --git a/third-party/jansson/Makefile b/third-party/jansson/Makefile
index a85efa0..2d9ef53 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 @@
             $(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 @@
 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 @@
 
 configure: source/config.status
 
-_install: _all
-
+install:
 uninstall:
 
 clean:

-- 
To view, visit https://gerrit.asterisk.org/9653
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-MessageType: merged
Gerrit-Change-Id: I7643cc3d39af9feba8fc0da676b646efc5f8b3bb
Gerrit-Change-Number: 9653
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20180725/abb2d4de/attachment-0001.html>