Diff

Differences From Artifact [b979ca24ac]:

To Artifact [9643cb7ce4]:


     1      1   CC       = pnacl-clang
     2      2   CXX      = pnacl-clang++
     3      3   AR       = pnacl-ar
     4      4   RANLIB   = pnacl-ranlib
     5      5   FINALIZE = pnacl-finalize
     6      6   
     7         -CACKEY_LIBS = -Llib -lcackey
            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     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     16   all: cackey.pexe
    17     17   
    18         -cackey.pexe: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a
           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     23   lib/libcackey.a: build-deps
    24     24   	mkdir -p lib
    25     25   	rm -f lib/libcackey.a
................................................................................
    28     28   	cd lib && ln -s ../workdir-*.inst/lib/libcackey.a .
    29     29   
    30     30   lib/libpcsc.a: lib/libcackey.a
    31     31   	mkdir -p lib
    32     32   	rm -f lib/libpcsc.a
    33     33   	cd lib && ln -s ../workdir-*.inst/lib/libpcsc.a .
    34     34   
           35  +lib/libz.a: lib/libcackey.a
           36  +	mkdir -p lib
           37  +	rm -f lib/libz.a
           38  +	cd lib && ln -s ../workdir-*.inst/lib/libz.a .
           39  +
    35     40   cackey-chrome.o: cackey-chrome.c
    36     41   cackey-chrome-init.o: cackey-chrome-init.cc
    37     42   
    38     43   clean:
    39     44   	rm -rf workdir-*
    40         -	rm -f lib/libcackey.a lib/libpcsc.a
           45  +	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
    41     46   	-rmdir lib
    42     47   	rm -f cackey-chrome.o cackey-chrome-init.o
    43     48   	rm -f cackey.pexe
    44     49   
    45     50   distclean: clean
    46     51   
    47     52   .PHONY: all clean distclean