More make and CI bits tweaks

This commit is contained in:
Dan Buch
2016-12-27 11:43:21 -05:00
parent b4a64d21cd
commit f02e32793d
2 changed files with 12 additions and 7 deletions

View File

@ -6,10 +6,15 @@ cache:
compiler: compiler:
- gcc - gcc
- clang - clang
install: 'true' env:
global:
- EXTRAFLAGS=
- PREFIX="${HOME}"
install:
- 'true'
script: script:
- make - make
- ./mcrcon -h - ./mcrcon -h
- ./mcrcon -v - ./mcrcon -v
- make install PREFIX="${HOME}" - make install
- make uninstall PREFIX="${HOME}" - make uninstall

View File

@ -6,10 +6,10 @@
EXENAME = mcrcon EXENAME = mcrcon
PREFIX ?= /usr/local PREFIX ?= /usr/local
CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os -s CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
EXTRAFLAGS = -fstack-protector-strong EXTRAFLAGS ?= -fstack-protector-strong
CC = gcc CC ?= gcc
INSTALL = install INSTALL = install
LINKER = LINKER =
RM = rm -f RM = rm -f
@ -22,7 +22,7 @@ endif
ifeq ($(shell uname), Darwin) ifeq ($(shell uname), Darwin)
INSTALL = ginstall INSTALL = ginstall
CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os
endif endif
.PHONY: all .PHONY: all