Diff

Differences From Artifact [51fdebc8fd]:

To Artifact [97d5ce9303]:


    15     15   libdir = @libdir@
    16     16   @SET_MAKE@
    17     17   
    18     18   all:
    19     19   	$(MAKE) libcackey.@SHOBJEXT@
    20     20   	-$(MAKE) libcackey_g.@SHOBJEXT@
    21     21   
    22         -cackey.o: cackey.c asn1-x509.h config.h
           22  +cackey.o: cackey.c cackey_builtin_certs.h sha1.h md5.h asn1-x509.h config.h
    23     23   	$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) -o cackey.o -c cackey.c
    24     24   
    25         -cackey_g.o: cackey.c asn1-x509.h config.h
           25  +cackey_g.o: cackey.c cackey_builtin_certs.h sha1.h md5.h asn1-x509.h config.h
    26     26   	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o cackey_g.o -c cackey.c
    27     27   
    28     28   asn1-x509.o: asn1-x509.c asn1-x509.h config.h
    29     29   	$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) -o asn1-x509.o -c asn1-x509.c
    30     30   
    31     31   asn1-x509_g.o: asn1-x509.c asn1-x509.h config.h
    32     32   	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o asn1-x509_g.o -c asn1-x509.c
    33     33   
    34         -libcackey.@SHOBJEXT@: cackey.o asn1-x509.o
    35         -	$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey.@SHOBJEXT@ cackey.o asn1-x509.o $(LIBS)
           34  +sha1.o: sha1.c sha1.h config.h
           35  +	$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) -o sha1.o -c sha1.c
           36  +
           37  +sha1_g.o: sha1.c sha1.h config.h
           38  +	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o sha1_g.o -c sha1.c
           39  +
           40  +md5.o: md5.c md5.h config.h
           41  +	$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) -o md5.o -c md5.c
           42  +
           43  +md5_g.o: md5.c md5.h config.h
           44  +	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o md5_g.o -c md5.c
           45  +
           46  +libcackey.@SHOBJEXT@: cackey.o asn1-x509.o sha1.o md5.o
           47  +	$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey.@SHOBJEXT@ cackey.o asn1-x509.o sha1.o md5.o $(LIBS)
    36     48   	-$(STRIP) -x "libcackey.@SHOBJEXT@"
    37     49   
    38         -libcackey_g.@SHOBJEXT@: cackey_g.o asn1-x509_g.o
    39         -	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey_g.@SHOBJEXT@ cackey_g.o asn1-x509_g.o $(LIBS)
           50  +libcackey_g.@SHOBJEXT@: cackey_g.o asn1-x509_g.o sha1_g.o md5_g.o
           51  +	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey_g.@SHOBJEXT@ cackey_g.o asn1-x509_g.o sha1.o md5_g.o $(LIBS)
    40     52   
    41     53   test: test.c libcackey_g.@SHOBJEXT@
    42     54   	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o test test.c -Wl,-R,. libcackey_g.@SHOBJEXT@
    43     55   
    44         -splint-cackey.txt: cackey.c asn1-x509.c asn1-x509.h config.h
           56  +splint-cackey.txt: cackey.c cackey_builtin_certs.h asn1-x509.c asn1-x509.h config.h
    45     57   	splint $(DEBUGCPPFLAGS) -DCACKEY_PARANOID=1 -weak +posixlib -I/usr/include/PCSC -Ipkcs11 cackey.c > splint-cackey.txt
    46     58   
    47     59   install: libcackey.@SHOBJEXT@
    48     60   	-mkdir -p "$(DESTDIR)$(libdir)"
    49     61   	rm -f "$(DESTDIR)$(libdir)/libcackey.@SHOBJEXT@"
    50     62   	rm -f "$(DESTDIR)$(libdir)/libcackey_g.@SHOBJEXT@"
    51     63   	cp "libcackey.@SHOBJEXT@" "$(DESTDIR)$(libdir)/"
    52     64   	-cp "libcackey_g.@SHOBJEXT@" "$(DESTDIR)$(libdir)/"
    53     65   
    54     66   clean:
    55     67   	rm -f libcackey.@SHOBJEXT@ libcackey_g.@SHOBJEXT@
    56     68   	rm -f libcackey.@SHOBJEXT@.def libcackey_g.@SHOBJEXT@.def
    57     69   	rm -f libcackey.@SHOBJEXT@.a libcackey_g.@SHOBJEXT@.a
    58         -	rm -f cackey.o asn1-x509.o cackey_g.o asn1-x509_g.o
           70  +	rm -f cackey.o asn1-x509.o cackey_g.o asn1-x509_g.o sha1.o sha1_g.o md5.o md5_g.o
    59     71   	rm -f test
    60     72   	rm -f splint-cackey.txt
    61     73   
    62     74   distclean: clean
    63     75   	rm -f config.log config.status config.h Makefile
    64     76   
    65     77   mrproper: distclean
    66     78   	rm -f configure config.h.in aclocal.m4 *~
    67     79   
    68     80   .PHONY: all clean distclean mrproper install