Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -8,7 +8,7 @@ PCSC_LDLIBS ?= $(shell pkg-config libpcs
 DESTDIR ?= /usr/local
 
 VERSION := $(shell pwd | sed s/.*tools-//)
-CFLAGS := $(CFLAGS) -DVERSION=\"$(VERSION)\" $(PCSC_CFLAGS)
+CFLAGS := -Wall -O2 $(OPTFLAGS) -DVERSION=\"$(VERSION)\" $(PCSC_CFLAGS)
 LDLIBS := $(PCSC_LDLIBS)
 # On xBSD systems use
 #LDLIBS = -lc_r $(PCSC_LDLIBS)