From: Iceman <iceman@iuse.se>
Date: Fri, 29 Sep 2017 10:02:10 +0000 (+0200)
Subject: Merge pull request #405 from ZenSecurity/master
X-Git-Tag: v3.1.0~164
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/5191ad9e556e4209945ccce8122a96d87c1e92d9?hp=ab92e6c301adf29e5091ed263e6ef589f15e33d4

Merge pull request #405 from ZenSecurity/master

Added bus blaster (http://dangerousprototypes.com/docs/Bus_Blaster) c…
---

diff --git a/client/Makefile b/client/Makefile
index fd2ae290..3a96e9e9 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,14 +12,15 @@ TARFLAGS = -C .. --ignore-failed-read -rvf
 RM = rm -f
 MV = mv
 
-#COMMON_FLAGS = -m32
+ENV_LDFLAGS := $(LDFLAGS)
+ENV_CFLAGS := $(CFLAGS)
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3
+LDFLAGS = $(ENV_LDFLAGS)
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
 
 LUAPLATFORM = generic
diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index 92d3be72..9dab37f5 100755
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -1,8 +1,8 @@
 VPATH = ../../common ../../common/crapto1 ../../client
 CC = gcc
 LD = gcc
-CFLAGS = -std=c99 -D_ISOC99_SOURCE -I../../include -I../../common -I../../client -Wall -O3
-LDFLAGS =
+CFLAGS += -std=c99 -D_ISOC99_SOURCE -I../../include -I../../common -I../../client -Wall -O3
+LDFLAGS +=
 
 OBJS = crypto1.o crapto1.o parity.o util_posix.o mfkey.o
 EXES = mfkey32 mfkey64