Overview
Comment: | Updated to strip release library
Updated list of headers to check for |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | b491412695941b7fea4003ec09f32643202649ca |
User & Date: | rkeene on 2010-05-17 05:04:11 |
Other Links: | manifest | tags |
Context
2010-05-17
| ||
05:09 |
Fixed issue with double-free when PC/SC connection manager is unavailable
Fixed issues found from splint(1) output check-in: c70fbcca60 user: rkeene tags: trunk | |
05:04 |
Updated to strip release library
Updated list of headers to check for check-in: b491412695 user: rkeene tags: trunk | |
04:50 | Updated to build both debug library and release library check-in: 0fae105f13 user: rkeene tags: trunk | |
Changes
Modified Makefile.in from [517d2e3149] to [7e5757e77e].
5
6
7
8
9
10
11
12
13
14
15
16
17
18
..
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
DEBUGCPPFLAGS = @CPPFLAGS@ -DCACKEY_DEBUG=1 -I./pkcs11/ @DEFS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ @PTHREAD_LIBS@
SHOBJFLAGS = @SHOBJFLAGS@
SHOBJLDFLAGS = @SHOBJLDFLAGS@
AR = @AR@
RANLIB = @RANLIB@
prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
@SET_MAKE@
all:
$(MAKE) libcackey.@SHOBJEXT@
................................................................................
$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) -o asn1-x509.o -c asn1-x509.c
asn1-x509_g.o: asn1-x509.c asn1-x509.h config.h
$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o asn1-x509_g.o -c asn1-x509.c
libcackey.@SHOBJEXT@: cackey.o asn1-x509.o
$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey.@SHOBJEXT@ cackey.o asn1-x509.o $(LIBS)
libcackey_g.@SHOBJEXT@: cackey_g.o asn1-x509_g.o
$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey_g.@SHOBJEXT@ cackey_g.o asn1-x509_g.o $(LIBS)
test: test.c libcackey_g.@SHOBJEXT@
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o test test.c -Wl,-R,. libcackey_g.@SHOBJEXT@
splint-cackey.txt: cackey.c asn1-x509.c asn1-x509.h config.h
splint $(CPPFLAGS) -weak +posixlib -I/usr/include/PCSC -Ipkcs11 cackey.c > splint-cackey.txt
install: libcackey.@SHOBJEXT@
-mkdir "$(DESTDIR)$(libdir)"
cp libcackey.@SHOBJEXT@ "$(DESTDIR)$(libdir)/"
-cp libcackey_g.@SHOBJEXT@ "$(DESTDIR)$(libdir)/"
clean:
rm -f libcackey.@SHOBJEXT@ libcackey_g.@SHOBJEXT@
rm -f cackey.o asn1-x509.o cackey_g.o asn1-x509_g.o
rm -f test
rm -f splint-cackey.txt
|
>
>
|
|
|
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
..
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
DEBUGCPPFLAGS = @CPPFLAGS@ -DCACKEY_DEBUG=1 -I./pkcs11/ @DEFS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @PTHREAD_LIBS@ SHOBJFLAGS = @SHOBJFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ AR = @AR@ RANLIB = @RANLIB@ STRIP = @STRIP@ prefix = @prefix@ exec_prefix = @exec_prefix@ libdir = @libdir@ @SET_MAKE@ all: $(MAKE) libcackey.@SHOBJEXT@ ................................................................................ $(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) -o asn1-x509.o -c asn1-x509.c asn1-x509_g.o: asn1-x509.c asn1-x509.h config.h $(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o asn1-x509_g.o -c asn1-x509.c libcackey.@SHOBJEXT@: cackey.o asn1-x509.o $(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey.@SHOBJEXT@ cackey.o asn1-x509.o $(LIBS) -$(STRIP) -g "libcackey.@SHOBJEXT@" libcackey_g.@SHOBJEXT@: cackey_g.o asn1-x509_g.o $(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey_g.@SHOBJEXT@ cackey_g.o asn1-x509_g.o $(LIBS) test: test.c libcackey_g.@SHOBJEXT@ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o test test.c -Wl,-R,. libcackey_g.@SHOBJEXT@ splint-cackey.txt: cackey.c asn1-x509.c asn1-x509.h config.h splint $(CPPFLAGS) -weak +posixlib -I/usr/include/PCSC -Ipkcs11 cackey.c > splint-cackey.txt install: libcackey.@SHOBJEXT@ -mkdir "$(DESTDIR)$(libdir)" cp "libcackey.@SHOBJEXT@" "$(DESTDIR)$(libdir)/" -cp "libcackey_g.@SHOBJEXT@" "$(DESTDIR)$(libdir)/" clean: rm -f libcackey.@SHOBJEXT@ libcackey_g.@SHOBJEXT@ rm -f cackey.o asn1-x509.o cackey_g.o asn1-x509_g.o rm -f test rm -f splint-cackey.txt |
Modified configure.ac from [ebb33ac593] to [0ec6a4dc40].
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
..
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
ACX_PTHREAD(, [
AC_WARN([Can't figure out how to compile with pthreads support, run-time will likely fail.])
])
dnl Determine how to create static archives on this platform
AC_CHECK_TOOL(AR, ar)
AC_CHECK_TOOL(RANLIB, ranlib)
dnl Check for all required headers
AC_CHECK_HEADERS(arpa/inet.h inttypes.h stdarg.h stdint.h stdio.h stdlib.h string.h sys/socket.h sys/types.h sys/un.h unistd.h pthread.h zlib.h,,[
AC_WARN([Required header missing, compilation will likely fail.])
], [
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
................................................................................
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_PTHREAD_H
# include <pthread.h>
#endif
#ifdef HAVE_ZLIB_H
# include <zlib.h>
#endif
])
dnl Check for PC/SC headers and libraries
DC_PCSC
|
>
>
>
|
>
>
>
|
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
..
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
ACX_PTHREAD(, [ AC_WARN([Can't figure out how to compile with pthreads support, run-time will likely fail.]) ]) dnl Determine how to create static archives on this platform AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib) dnl Determine how to strip executables AC_CHECK_TOOL(STRIP, strip) dnl Check for all required headers AC_CHECK_HEADERS(arpa/inet.h inttypes.h stdarg.h stdint.h stdio.h stdlib.h string.h sys/socket.h sys/types.h sys/un.h unistd.h pthread.h zlib.h limits.h,,[ AC_WARN([Required header missing, compilation will likely fail.]) ], [ #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif #ifdef HAVE_INTTYPES_H # include <inttypes.h> ................................................................................ #endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif #ifdef HAVE_PTHREAD_H # include <pthread.h> #endif #ifdef HAVE_LIMITS_H # include <limits.h> #endif #ifdef HAVE_ZLIB_H # include <zlib.h> #endif ]) dnl Check for PC/SC headers and libraries DC_PCSC |