| Alexander Afanasyev | 9944ebc | 2012-08-20 18:40:12 -0700 | [diff] [blame^] | 1 | diff --git csrc/lib/dir.mk csrc/lib/dir.mk |
| 2 | index 6489299..145eec7 100644 |
| 3 | --- csrc/lib/dir.mk |
| 4 | +++ csrc/lib/dir.mk |
| 5 | @@ -78,7 +78,7 @@ shlib: $(SHLIBNAME) |
| 6 | lib: libccn.a |
| 7 | |
| 8 | test: default keystore_check encodedecodetest ccnbtreetest |
| 9 | - ./encodedecodetest -o /dev/null |
| 10 | + ./encodedecodetest -k $(CCNX_DIR)/.ccnx_keystore -o /dev/null |
| 11 | ./ccnbtreetest |
| 12 | ./ccnbtreetest - < q.dat |
| 13 | rm -R _bt_* |
| 14 | @@ -87,12 +87,12 @@ dtag_check: _always |
| 15 | @./gen_dtag_table 2>/dev/null | diff - ccn_dtag_table.c | grep '^[<]' >/dev/null && echo '*** Warning: ccn_dtag_table.c may be out of sync with tagnames.cvsdict' || : |
| 16 | |
| 17 | keystore_check: ccn_initkeystore.sh |
| 18 | - test -f "$$HOME/.ccnx/.ccnx_keystore" || $(MAKE) -f dir.mk new_keystore |
| 19 | + test -f "$(CCNX_DIR)/.ccnx_keystore" || $(MAKE) -f dir.mk new_keystore |
| 20 | |
| 21 | new_keystore: |
| 22 | @echo === CCNx Keystore not found in your home directory |
| 23 | @echo === I will create one for you now '(^C to abort)' |
| 24 | - sleep 1 && sh ccn_initkeystore.sh && sleep 3 && mv .ccnx "$$HOME" |
| 25 | + sleep 1 && sh ccn_initkeystore.sh && sleep 3 && mkdir -p "$(CCNX_DIR)/" && mv .ccnx/.ccnx_keystore "$(CCNX_DIR)/" |
| 26 | |
| 27 | libccn.a: $(LIB_OBJS) |
| 28 | ar crus $@ $(LIB_OBJS) |
| 29 | @@ -113,7 +113,7 @@ skel_decode_test: skel_decode_test.o |
| 30 | basicparsetest: basicparsetest.o libccn.a |
| 31 | $(CC) $(CFLAGS) -o $@ basicparsetest.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto |
| 32 | |
| 33 | -encodedecodetest: encodedecodetest.o |
| 34 | +encodedecodetest: encodedecodetest.o libccn.a |
| 35 | $(CC) $(CFLAGS) -o $@ encodedecodetest.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto |
| 36 | |
| 37 | ccn_digest.o: |
| 38 | @@ -149,16 +149,16 @@ ccn_fetch.o: |
| 39 | ccn_verifysig.o: |
| 40 | $(CC) $(CFLAGS) $(OPENSSL_CFLAGS) -c ccn_verifysig.c |
| 41 | |
| 42 | -ccn_verifysig: ccn_verifysig.o |
| 43 | +ccn_verifysig: ccn_verifysig.o libccn.a |
| 44 | $(CC) $(CFLAGS) -o $@ ccn_verifysig.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto |
| 45 | |
| 46 | signbenchtest.o: |
| 47 | $(CC) $(CFLAGS) $(OPENSSL_CFLAGS) -c signbenchtest.c |
| 48 | |
| 49 | -signbenchtest: signbenchtest.o |
| 50 | +signbenchtest: signbenchtest.o libccn.a |
| 51 | $(CC) $(CFLAGS) -o $@ signbenchtest.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto |
| 52 | |
| 53 | -ccndumppcap: ccndumppcap.o |
| 54 | +ccndumppcap: ccndumppcap.o libccn.a |
| 55 | $(CC) $(CFLAGS) -o $@ ccndumppcap.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto -lpcap |
| 56 | |
| 57 | ccnbtreetest.o: |