Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -1,12 +1,10 @@
 CC = @PTHREAD_CC@
-RELCFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
+CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
 DEBUGCFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@ -DCACKEY_DEBUG=1
-RELCPPFLAGS = @CPPFLAGS@ @DEFS@ -I./pkcs11/
+CPPFLAGS = @CPPFLAGS@ @DEFS@ -I./pkcs11/
 DEBUGCPPFLAGS = @CPPFLAGS@ -DCACKEY_DEBUG=1 -I./pkcs11/ @DEFS@
-CFLAGS = $(DEBUGCFLAGS)
-CPPFLAGS = $(DEBUGCPPFLAGS)
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@ @PTHREAD_LIBS@
 SHOBJFLAGS = @SHOBJFLAGS@
 SHOBJLDFLAGS = @SHOBJLDFLAGS@
 AR = @AR@
@@ -14,34 +12,46 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
 @SET_MAKE@
 
-all: libcackey.@SHOBJEXT@
+all:
+	$(MAKE) libcackey.@SHOBJEXT@
+	-$(MAKE) libcackey_g.@SHOBJEXT@
 
 cackey.o: cackey.c asn1-x509.h config.h
 	$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) -o cackey.o -c cackey.c
 
+cackey_g.o: cackey.c asn1-x509.h config.h
+	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o cackey_g.o -c cackey.c
+
 asn1-x509.o: asn1-x509.c asn1-x509.h config.h
 	$(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)
 
-test: test.c libcackey.@SHOBJEXT@
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o test test.c -Wl,-R,. 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@
-	rm -f cackey.o asn1-x509.o
+	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
 
 distclean: clean
 	rm -f config.log config.status config.h Makefile