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:
- gcc
- clang
install: 'true'
env:
global:
- EXTRAFLAGS=
- PREFIX="${HOME}"
install:
- 'true'
script:
- make
- ./mcrcon -h
- ./mcrcon -v
- make install PREFIX="${HOME}"
- make uninstall PREFIX="${HOME}"
- make install
- make uninstall

View File

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