kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build System: Fix bundled jansson install.

Browse Source 
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 b876d624d7
commit ab103d66db
1 changed files with 5 additions and 7 deletions
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: .NOTPARALLEL:
@@ -39,10 +39,9 @@ ifeq ($(SPECIAL_TARGETS),)
$(warning ASTTOPDIR/menuselect hasn't been run yet. Can't find debug options.) $(warning ASTTOPDIR/menuselect hasn't been run yet. Can't find debug options.)
endif endif
all: _all all: dest/include/jansson.h
install: _install
else else
all install: all:
endif endif
endif endif
@@ -53,7 +52,7 @@ include Makefile.rules
ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] ' ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] '
SHELL_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. $(ECHO_PREFIX) Building bundled jansson.
$(CMD_PREFIX) (cd source; make) $(CMD_PREFIX) (cd source; make)
$(CMD_PREFIX) (cd source; make install) $(CMD_PREFIX) (cd source; make install)
@@ -86,8 +85,7 @@ source/config.status: source/.unpacked Makefile.rules .rebuild_needed
configure: source/config.status configure: source/config.status
_install: _all install:
uninstall: uninstall:
clean: clean: