Check-in [b0a1326758]
Overview
Comment:Create a native manifest for CACKey on Chrome and other fixups
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:b0a1326758f2e1d27bd9327e158107a83d9c36fa
User & Date: rkeene on 2016-02-04 18:07:42
Other Links: manifest | tags
Context
2016-02-04
18:23
Added start of Chrome javascript module check-in: 1578fc80e7 user: rkeene tags: trunk
18:07
Create a native manifest for CACKey on Chrome and other fixups check-in: b0a1326758 user: rkeene tags: trunk
17:50
Refer to correct PC/SC headers and link to zlib in final target check-in: 88d2f36ad4 user: rkeene tags: trunk
Changes

Modified build/chrome/Makefile from [9643cb7ce4] to [738bd8073d].

     9      9   LIBS        = $(CACKEY_LIBS) $(PCSC_LIBS)
    10     10   CFLAGS      = -Wall -I${NACL_SDK_ROOT}/include
    11     11   CXXFLAGS    = $(CFLAGS)
    12     12   
    13     13   PATH += :${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
    14     14   export PATH
    15     15   
    16         -all: cackey.pexe
           16  +all: cackey.pexe cackey.nmf
    17     17   
    18     18   cackey.pexe: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a lib/libz.a
    19     19   	$(CXX) -o cackey.pexe.new cackey-chrome.o cackey-chrome-init.o $(LIBS)
    20     20   	$(FINALIZE) cackey.pexe.new
    21     21   	mv cackey.pexe.new cackey.pexe
    22     22   
           23  +cackey.nmf: cackey.pexe
           24  +	${NACL_SDK_ROOT}/tools/create_nmf.py cackey.pexe > cackey.nmf.new
           25  +	mv cackey.nmf.new cackey.nmf
           26  +
    23     27   lib/libcackey.a: build-deps
    24     28   	mkdir -p lib
    25     29   	rm -f lib/libcackey.a
    26     30   	rm -rf workdir-*
    27     31   	./build-deps
    28     32   	cd lib && ln -s ../workdir-*.inst/lib/libcackey.a .
           33  +	touch lib/libcackey.a
    29     34   
    30     35   lib/libpcsc.a: lib/libcackey.a
    31     36   	mkdir -p lib
    32     37   	rm -f lib/libpcsc.a
    33     38   	cd lib && ln -s ../workdir-*.inst/lib/libpcsc.a .
           39  +	touch lib/libpcsc.a
    34     40   
    35     41   lib/libz.a: lib/libcackey.a
    36     42   	mkdir -p lib
    37     43   	rm -f lib/libz.a
    38     44   	cd lib && ln -s ../workdir-*.inst/lib/libz.a .
           45  +	touch lib/libz.a
    39     46   
    40     47   cackey-chrome.o: cackey-chrome.c
    41     48   cackey-chrome-init.o: cackey-chrome-init.cc
    42     49   
    43     50   clean:
    44     51   	rm -rf workdir-*
    45     52   	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a