Print this page
Don't assume make is gmake

Split Close
Expand all
Collapse all
          --- old/./Makefile
          +++ new/./Makefile
↓ open down ↓ 10 lines elided ↑ open up ↑
  11   11  # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
  12   12  # express or implied. See the License for the specific language governing
  13   13  # permissions and limitations under the License.
  14   14  #
  15   15  
  16   16  DIRS=$(wildcard */)
  17   17  SRCS=$(wildcard *.c)
  18   18  OBJS=$(SRCS:.c=.o)
  19   19  
  20   20  all: bin
  21      -        make -C tests
       21 +        $(MAKE) -C tests
  22   22  
  23   23  include s2n.mk
  24   24  
  25   25  libs:
  26      -        make -C utils
  27      -        make -C error
  28      -        make -C stuffer
  29      -        make -C crypto
  30      -        make -C tls
  31      -        make -C lib
       26 +        $(MAKE) -C utils
       27 +        $(MAKE) -C error
       28 +        $(MAKE) -C stuffer
       29 +        $(MAKE) -C crypto
       30 +        $(MAKE) -C tls
       31 +        $(MAKE) -C lib
  32   32  
  33   33  bin: libs
  34      -        make -C bin
       34 +        $(MAKE) -C bin
  35   35  
  36   36  indent:
  37      -        make -C tests indentsource
  38      -        make -C stuffer indentsource
  39      -        make -C crypto indentsource
  40      -        make -C utils indentsource
  41      -        make -C error indentsource
  42      -        make -C tls indentsource
  43      -        make -C bin indentsource
       37 +        $(MAKE) -C tests indentsource
       38 +        $(MAKE) -C stuffer indentsource
       39 +        $(MAKE) -C crypto indentsource
       40 +        $(MAKE) -C utils indentsource
       41 +        $(MAKE) -C error indentsource
       42 +        $(MAKE) -C tls indentsource
       43 +        $(MAKE) -C bin indentsource
  44   44  
  45   45  pre_commit_check: all indent clean
  46   46  
  47   47  clean:
  48      -        make -C tests clean
  49      -        make -C stuffer decruft
  50      -        make -C crypto decruft
  51      -        make -C utils decruft
  52      -        make -C error decruft
  53      -        make -C tls decruft
  54      -        make -C bin decruft
  55      -        make -C lib decruft
       48 +        $(MAKE) -C tests clean
       49 +        $(MAKE) -C stuffer decruft
       50 +        $(MAKE) -C crypto decruft
       51 +        $(MAKE) -C utils decruft
       52 +        $(MAKE) -C error decruft
       53 +        $(MAKE) -C tls decruft
       54 +        $(MAKE) -C bin decruft
       55 +        $(MAKE) -C lib decruft
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX