Skip to content
Snippets Groups Projects
Commit af5984d6 authored by Corey Farrell's avatar Corey Farrell
Browse files

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
parent cdb72552
No related branches found
No related tags found
No related merge requests found
.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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment