Diff

Differences From Artifact [7468d6c1f8]:

To Artifact [44984e905a]:


     3      3   AR       = pnacl-ar
     4      4   RANLIB   = pnacl-ranlib
     5      5   FINALIZE = pnacl-finalize
     6      6   
     7      7   CACKEY_LIBS = -Llib -lcackey -lz
     8      8   PCSC_LIBS   = -Llib -lpcsc -L${NACL_SDK_ROOT}/lib/pnacl/Release -lppapi -lppapi_cpp
     9      9   LIBS        = $(CACKEY_LIBS) $(PCSC_LIBS)
    10         -CFLAGS      = -Wall -I${NACL_SDK_ROOT}/include -I../../pkcs11 -Iinclude/PCSC
           10  +CFLAGS      = -Wall -I${NACL_SDK_ROOT}/include -I../../pkcs11 -Iinclude
    11     11   CXXFLAGS    = $(CFLAGS) -std=gnu++11
    12     12   
    13     13   CACKEY_DEBUG = 0
    14     14   ifeq (1,$(CACKEY_DEBUG))
    15     15   CACKEY_LIBNAME     = libcackey_g
    16     16   CACKEY_EXECUTABLES = cackey.pexe cackey.bc
    17     17   CFLAGS             += -g3 -ggdb3
................................................................................
    68     68   	mkdir -p lib
    69     69   	rm -f lib/libz.a
    70     70   	cd lib && ln -s ../workdir-*.inst/lib/libz.a .
    71     71   	touch lib/libz.a
    72     72   
    73     73   google-pcsc.js: lib/libcackey.a
    74     74   	rm -f google-pcsc.js google-pcsc.js.new
    75         -	cat workdir-*.inst/js/scope.js > google-pcsc.js.new
    76         -	echo 'GoogleSmartCard.IS_DEBUG_BUILD = $(CACKEY_DEBUG);' >> google-pcsc.js.new
    77         -	cat workdir-*.inst/js/{logging,pcsc,pcsc-nacl}.js >> google-pcsc.js.new
           75  +	cat workdir-*.inst/js/libpcsc.js > google-pcsc.js.new
    78     76   	mv google-pcsc.js.new google-pcsc.js
    79     77   
    80         -include/PCSC/pcsc-nacl.h: lib/libcackey.a
    81         -	mkdir -p include/PCSC
    82         -	rm -f include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h
    83         -	cd include/PCSC && ln -s ../../workdir-*.inst/include/PCSC/pcsc-nacl.h pcsc-nacl.h.new
    84         -	touch include/PCSC/pcsc-nacl.h.new
    85         -	mv include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h
           78  +include/libpcsc.h: lib/libcackey.a
           79  +	mkdir -p include
           80  +	rm -f include/libpcsc.h.new include/libpcsc.h
           81  +	cd include && ln -s ../workdir-*.inst/include/libpcsc.h libpcsc.h.new
           82  +	touch include/libpcsc.h.new
           83  +	mv include/libpcsc.h.new include/libpcsc.h
    86     84   
    87     85   manifest.json: manifest.json.in ../../configure.ac
    88     86   	rm -f manifest.json.new
    89     87   	sed 's/@PACKAGE_VERSION@/$(shell sed '/^AC_INIT/ {s@.*, @@;s@[^0-9\.].@@g;p};d' ../../configure.ac)/g' manifest.json.in > manifest.json.new
    90     88   	mv manifest.json.new manifest.json
    91     89   
    92     90   jsrsasign.js:
................................................................................
    94     92   	test "`openssl sha256 jsrsasign.js.new | sed 's@.*= *@@'`" = '99b041bccc846f03623ce52f5932bd3ff282a064e7077a4ad1c600fc70c1176b'
    95     93   	mv jsrsasign.js.new jsrsasign.js
    96     94   
    97     95   test: cackey-chrome-pkcs11.c cackey-chrome-test.c ../../cackey.c Makefile
    98     96   	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-pkcs11.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
    99     97   
   100     98   cackey-chrome-pkcs11.o: cackey-chrome-pkcs11.c cackey-chrome.h
   101         -cackey-chrome-plugin.o: cackey-chrome-plugin.cc cackey-chrome.h include/PCSC/pcsc-nacl.h
           99  +cackey-chrome-plugin.o: cackey-chrome-plugin.cc cackey-chrome.h include/libpcsc.h
   102    100   
   103    101   clean:
   104    102   	rm -f cackey-chrome-pkcs11.o cackey-chrome-plugin.o
   105    103   	rm -f cackey.pexe cackey.bc
   106    104   	rm -f cackey.zip cackey.nmf
   107    105   	rm -f manifest.json manifest.json.new
   108    106   	rm -f test
   109    107   
   110    108   distclean: clean
   111    109   	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
   112    110   	-rmdir lib
   113         -	rm -f include/PCSC/pcsc-nacl.h
          111  +	rm -f include/libpcsc.h
   114    112   	-rmdir include/PCSC
   115    113   	-rmdir include
   116    114   	rm -f google-pcsc.js
   117    115   	rm -rf workdir-*
   118    116   	rm -f jsrsasign.js jsrsasign.js.new
   119    117   
   120    118   .PHONY: all clean distclean