From aabac075ddf07d486011f9c42c96cc40495861ad Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Thu, 5 Aug 2010 16:24:24 +0200
Subject: Don't repeat the list of example programs

---
 examples/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/Makefile')

diff --git a/examples/Makefile b/examples/Makefile
index 100cc49..749a4b8 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -28,4 +28,4 @@ check: $(progs)
 	./speed
 
 clean:
-	rm -f *.o *~ hmac cipher ncr pk speed 
\ No newline at end of file
+	rm -f *.o *~ $(progs)
\ No newline at end of file
-- 
cgit 


From c3c5893c98b575a6316d313d9c7439260778c72c Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Thu, 5 Aug 2010 16:26:08 +0200
Subject: Integrate examples/ncr_lib.c

---
 examples/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'examples/Makefile')

diff --git a/examples/Makefile b/examples/Makefile
index 749a4b8..56b92b2 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,7 +1,8 @@
 CC = gcc
 CFLAGS = -Wall -g -O2
+USERSPACE_LDFLAGS = -L../userspace -lcryptodev
 
-progs := cipher hmac ncr pk speed
+progs := cipher hmac ncr ncr_lib pk speed
 
 all: $(progs)
 
@@ -17,11 +18,15 @@ hmac: hmac.c
 ncr: ncr.c
 	$(CC) $(CFLAGS) $< -o $@
 
+ncr_lib: ncr_lib.c
+	$(CC) $(CFLAGS) $< $(USERSPACE_LDFLAGS) -o $@
+
 pk: pk.c
 	$(CC) $(CFLAGS) $< -o $@ -L/usr/local/lib -lgnutls
 
 check: $(progs)
 	./ncr
+	LD_LIBRARY_PATH=../userspace ./ncr_lib
 	./pk
 	./cipher
 	./hmac
-- 
cgit 


From 9195a0942b821d2c0c78477fec78a413a081f2f6 Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Fri, 6 Aug 2010 02:33:17 +0200
Subject: Add port of examples/pk.c to libcryptodev

---
 examples/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'examples/Makefile')

diff --git a/examples/Makefile b/examples/Makefile
index 56b92b2..fb07989 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,8 +1,9 @@
 CC = gcc
 CFLAGS = -Wall -g -O2
+GNUTLS_LDFLAGS = -L/usr/local/lib -lgnutls
 USERSPACE_LDFLAGS = -L../userspace -lcryptodev
 
-progs := cipher hmac ncr ncr_lib pk speed
+progs := cipher hmac ncr ncr_lib pk pk_lib speed
 
 all: $(progs)
 
@@ -22,12 +23,16 @@ ncr_lib: ncr_lib.c
 	$(CC) $(CFLAGS) $< $(USERSPACE_LDFLAGS) -o $@
 
 pk: pk.c
-	$(CC) $(CFLAGS) $< -o $@ -L/usr/local/lib -lgnutls
+	$(CC) $(CFLAGS) $< -o $@ $(GNUTLS_LDFLAGS)
+
+pk_lib: pk_lib.c
+	$(CC) $(CFLAGS) $< $(GNUTLS_LDFLAGS) $(USERSPACE_LDFLAGS) -o $@
 
 check: $(progs)
 	./ncr
 	LD_LIBRARY_PATH=../userspace ./ncr_lib
 	./pk
+	LD_LIBRARY_PATH=../userspace ./pk_lib
 	./cipher
 	./hmac
 	./speed
-- 
cgit 


From 6e6fafa6663724240e202ee95908b476e7443075 Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Sat, 7 Aug 2010 07:14:40 +0200
Subject: Abstract <linux/ncr.h> from <ncrypto.h> users

Let <ncrypto.h> users #include this header file alone, without caring
about <linux/ncr.h>.

To do so, set up a temporary copy of ncr.h so that the
	#include <linux/ncr.h>
works at build time as well.
---
 examples/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/Makefile')

diff --git a/examples/Makefile b/examples/Makefile
index fb07989..33a67bc 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -g -O2
+CFLAGS = -Wall -g -O2 -I../userspace
 GNUTLS_LDFLAGS = -L/usr/local/lib -lgnutls
 USERSPACE_LDFLAGS = -L../userspace -lcryptodev
 
-- 
cgit