@@ -5,25 +5,31 @@
 FINALIZE = pnacl-finalize
 
 CACKEY_LIBS = -Llib -lcackey -lz
 PCSC_LIBS   = -Llib -lpcsc -L${NACL_SDK_ROOT}/lib/pnacl/Release -lppapi -lppapi_cpp
 LIBS        = $(CACKEY_LIBS) $(PCSC_LIBS)
-CFLAGS      = -Wall -I${NACL_SDK_ROOT}/include
-CXXFLAGS    = $(CFLAGS)
+CFLAGS      = -Wall -g3 -ggdb3 -I${NACL_SDK_ROOT}/include -I../../pkcs11 -Iinclude/PCSC
+CXXFLAGS    = $(CFLAGS) -std=gnu++11
+LDFLAGS     = -g3 -ggdb3
 
 PATH += :${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
 export PATH
 
+ifeq (,${NACL_SDK_ROOT})
+$(error "Please set NACL_SDK_ROOT")
+endif
+export NACL_SDK_ROOT
+
 all: cackey.crx
 
-cackey.crx: cackey.pexe cackey.nmf manifest.json cackey.js
+cackey.crx: cackey.pexe cackey.nmf manifest.json cackey.js google-pcsc.js
 	rm -f cackey.crx
 	zip cackey.crx.new $^
 	mv cackey.crx.new cackey.crx
 
 cackey.pexe: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a lib/libz.a
-	$(CXX) -o cackey.pexe.new cackey-chrome.o cackey-chrome-init.o $(LIBS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cackey.pexe.new cackey-chrome.o cackey-chrome-init.o $(LIBS)
 	$(FINALIZE) cackey.pexe.new
 	mv cackey.pexe.new cackey.pexe
 
 cackey.nmf: cackey.pexe
 	${NACL_SDK_ROOT}/tools/create_nmf.py cackey.pexe > cackey.nmf.new
@@ -31,12 +37,12 @@
 
 lib/libcackey.a: build-deps
 	mkdir -p lib
 	rm -f lib/libcackey.a
 	rm -rf workdir-*
-	./build-deps
-	cd lib && ln -s ../workdir-*.inst/lib/libcackey.a .
+	+./build-deps
+	cd lib && ln -s ../workdir-*.inst/lib/libcackey_g.a libcackey.a
 	touch lib/libcackey.a
 
 lib/libpcsc.a: lib/libcackey.a
 	mkdir -p lib
 	rm -f lib/libpcsc.a
@@ -47,18 +53,38 @@
 	mkdir -p lib
 	rm -f lib/libz.a
 	cd lib && ln -s ../workdir-*.inst/lib/libz.a .
 	touch lib/libz.a
 
-cackey-chrome.o: cackey-chrome.c
-cackey-chrome-init.o: cackey-chrome-init.cc
+google-pcsc.js: lib/libcackey.a
+	rm -f google-pcsc.js google-pcsc.js.new
+	cat workdir-*.inst/js/{scope,logging,pcsc,pcsc-nacl}.js > google-pcsc.js.new
+	mv google-pcsc.js.new google-pcsc.js
+
+include/PCSC/pcsc-nacl.h: lib/libcackey.a
+	mkdir -p include/PCSC
+	rm -f include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h
+	cd include/PCSC && ln -s ../../workdir-*.inst/include/PCSC/pcsc-nacl.h pcsc-nacl.h.new
+	touch include/PCSC/pcsc-nacl.h.new
+	mv include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h
+
+test: cackey-chrome.c cackey-chrome-test.c ../../cackey.c Makefile
+	gcc -g3 -ggdb3 -Wall -I. -I../../pkcs11 -I/opt/appfs/core.appfs.rkeene.org/zlib/platform/latest/include -I/opt/appfs/rkeene.org/pcsc-lite/platform/latest/include/PCSC -DHAVE_WINTYPES_H=1 -DHAVE_PCSCLITE_H=1 -DHAVE_WINSCARD_H=1 -DHAVE_STDINT_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_PTHREAD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_STDIO_H=1 -DHAVE_ZLIB_H -DHAVE_LIBZ -DCACKEY_DEBUG=1 -o test cackey-chrome.c cackey-chrome-test.c ../../cackey.c -L/opt/appfs/core.appfs.rkeene.org/zlib/platform/latest/lib -lz -L/opt/appfs/rkeene.org/pcsc-lite/platform/latest/lib -lpcsclite -L/opt/appfs/core.appfs.rkeene.org/glibc/platform/latest/lib -lc -lpthread -Wl,-R,/opt/appfs/core.appfs.rkeene.org/zlib/platform/latest/lib -Wl,-R,/opt/appfs/rkeene.org/pcsc-lite/platform/latest/lib -Wl,-R,/opt/appfs/core.appfs.rkeene.org/glibc/platform/latest/lib -Wl,-dynamic-linker,/opt/appfs/core.appfs.rkeene.org/glibc/platform/latest/lib/ld-linux-x86-64.so.2
+
+cackey-chrome.o: cackey-chrome.c cackey-chrome.h
+cackey-chrome-init.o: cackey-chrome-init.cc cackey-chrome.h include/PCSC/pcsc-nacl.h
 
 clean:
-	rm -rf workdir-*
-	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
-	-rmdir lib
 	rm -f cackey-chrome.o cackey-chrome-init.o
 	rm -f cackey.pexe
+	rm -f cackey.crx cackey.nmf
 
 distclean: clean
+	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
+	-rmdir lib
+	rm -f include/PCSC/pcsc-nacl.h
+	-rmdir include/PCSC
+	-rmdir include
+	rm -f google-pcsc.js
+	rm -rf workdir-*
 
 .PHONY: all clean distclean