From 73dc76b0bf87336d5e0a5d8f8c820a0c5e4de364 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Tue, 29 Aug 2017 11:33:34 -0700 Subject: Separation of module prerequisites for 'all' target in Makefile. To avoid using sed -i. --- auto/modules/go | 4 ++-- auto/modules/php | 4 ++-- auto/modules/python | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'auto/modules') diff --git a/auto/modules/go b/auto/modules/go index 27670dca..dcbc63a5 100644 --- a/auto/modules/go +++ b/auto/modules/go @@ -95,6 +95,8 @@ cat << END >> $NXT_MAKEFILE .PHONY: ${NXT_GO} +all: ${NXT_GO} + NXT_ROOT = `pwd` GOPATH = $NXT_GO_PATH @@ -115,5 +117,3 @@ ${NXT_GO}-uninstall: rm -f \$(GOPATH)/pkg/\$(GOOS)_\$(GOARCH)/nginext.a END - -sed -i.bak -e "s/\(all:.*\)/\1 ${NXT_GO}/" $NXT_MAKEFILE diff --git a/auto/modules/php b/auto/modules/php index cf4f3837..bb9fa848 100644 --- a/auto/modules/php +++ b/auto/modules/php @@ -150,6 +150,8 @@ cat << END >> $NXT_MAKEFILE .PHONY: ${NXT_PHP_MODULE} +all: ${NXT_PHP_MODULE} + ${NXT_PHP_MODULE}: $NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE} $NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE}: $nxt_objs @@ -157,5 +159,3 @@ $NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE}: $nxt_objs $nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS} END - -sed -i.bak -e "s/\(all:.*\)/\1 ${NXT_PHP_MODULE}/" $NXT_MAKEFILE diff --git a/auto/modules/python b/auto/modules/python index b07ed19f..91d0ed79 100644 --- a/auto/modules/python +++ b/auto/modules/python @@ -147,6 +147,8 @@ cat << END >> $NXT_MAKEFILE .PHONY: ${NXT_PYTHON_MODULE} +all: ${NXT_PYTHON_MODULE} + ${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE} $NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE}: $nxt_objs @@ -154,5 +156,3 @@ $NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE}: $nxt_objs $nxt_objs $NXT_PYTHON_LIBS END - -sed -i.bak -e "s/\(all:.*\)/\1 ${NXT_PYTHON_MODULE}/" $NXT_MAKEFILE -- cgit