GopherProxy

	Merge pull request #48 from czarkoff/cflags - sam - An updated version of the s…
	git clone git://vernunftzentrum.de/sam.git
	Log
	Files
	Refs
	LICENSE
	---
	commit 2150ea1ae95e0495f7a24623178496f3f7221c3b
	parent 71aaff563cdaf41ce7029713cd05a1ed1dad70c4
	Author: Rob King <[email protected]>
	Date: Mon, 23 Jan 2017 10:31:50 -0600

	Merge pull request #48 from czarkoff/cflags

	Don't override CFLAGS from environment
	Diffstat:
	config.mk.def \| 4 +++-
	libXg/Makefile \| 2 +-
	libframe/Makefile \| 2 +-
	sam/Makefile \| 2 +-
	samterm/Makefile \| 2 +-

	5 files changed, 7 insertions(+), 5 deletions(-)
	---
	diff --git a/config.mk.def b/config.mk.def
	@@ -2,7 +2,9 @@
	# copyright 2015 Rob King <[email protected]>

	# CC is the C compiler to use
	-CC=gcc -std=c99
	+CC=gcc
	+CFLAGS?=
	+CFLAGS+=-std=c99

	# STANDARDS names the C preprocessor defines that need to
	# be present to get a more-or-less standard compilation
	diff --git a/libXg/Makefile b/libXg/Makefile
	@@ -20,7 +20,7 @@ AR=ar
	# the name of the library
	LIB=libXg.a

	-CFLAGS=$(STANDARDS) $(INCS) $(INCLUDES)
	+CFLAGS+=$(STANDARDS) $(INCS) $(INCLUDES)
	CC?=c99

	OBJS= arith.o balloc.o bitblt.o border.o bscreenrect.o\
	diff --git a/libframe/Makefile b/libframe/Makefile
	@@ -15,7 +15,7 @@ RANLIB=:
	# add name of library
	AR=ar

	-CFLAGS=-c $(INCS) $(STANDARDS) $(INCLUDES)
	+CFLAGS+=-c $(INCS) $(STANDARDS) $(INCLUDES)

	LIB=libframe.a
	CC?=c99
	diff --git a/sam/Makefile b/sam/Makefile
	@@ -20,7 +20,7 @@ SAMDIR=$(BINDIR)
	SHELLNAME=sh
	SHELLPATH=/bin/sh

	-CFLAGS=$(STANDARDS) $(INCS) $(INCLUDES) -DRXPATH='"$(RXPATH)"'
	+CFLAGS+=$(STANDARDS) $(INCS) $(INCLUDES) -DRXPATH='"$(RXPATH)"'

	CC?=c99

	diff --git a/samterm/Makefile b/samterm/Makefile
	@@ -17,7 +17,7 @@ SAMTERM=$(BINDIR)/samterm
	# or if you need extra libraries to load with X11 applications
	XLIBS=-lXt -lX11 -lXft -lXi

	-CFLAGS=$(INCS) $(STANDARDS) $(INCLUDES)
	+CFLAGS+=$(INCS) $(STANDARDS) $(INCLUDES)

	LIBS=../libframe/libframe.a ../libXg/libXg.a
	CC?=c99