Move curvecp, split libcurvecp to its own dir

2013-02-18 15:14:55 -08:00 · 2013-02-18 15:14:55 -08:00 · 926803f996
commit 926803f996
parent 60d788a444
64 changed files with 41 additions and 37 deletions
--- a/.gitignore
+++ b/.gitignore
@ -38,12 +38,11 @@ m4/lt~obsolete.m4
 man/*.html
 man/Makefile.in
 missing
-src/libsodium/curvecp/curvecpclient
-src/libsodium/curvecp/curvecpmakekey
-src/libsodium/curvecp/curvecpmessage
-src/libsodium/curvecp/curvecpprintkey
-src/libsodium/curvecp/curvecpserver
-src/libsodium/include/sodium/version.h
+src/curvecp/curvecpclient
+src/curvecp/curvecpmakekey
+src/curvecp/curvecpmessage
+src/curvecp/curvecpprintkey
+src/curvecp/curvecpserver
 stamp-*
 test/default/*.res
 test/default/*.trs
--- a/configure.ac
+++ b/configure.ac
@ -226,8 +226,9 @@ AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */

 AC_CONFIG_FILES([Makefile
                 src/Makefile
+                 src/curvecp/Makefile
+                 src/curvecp/libcurvecp/Makefile
                 src/libsodium/Makefile
-                 src/libsodium/curvecp/Makefile
                 src/libsodium/include/Makefile
                 src/libsodium/include/sodium/version.h
                 test/default/Makefile
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,3 +1,4 @@

 SUBDIRS = \
-	libsodium
+	libsodium \
+	curvecp
--- a/src/curvecp/Makefile.am
+++ b/src/curvecp/Makefile.am
@ -0,0 +1,32 @@
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/libsodium/include/sodium \
+	-Ilibcurvecp
+
+LDADD = \
+	libcurvecp/libcurvecp.la
+
+bin_PROGRAMS = \
+	curvecpprintkey \
+	curvecpmakekey \
+	curvecpclient \
+	curvecpserver \
+	curvecpmessage
+
+curvecpprintkey_SOURCES = \
+	curvecpprintkey.c
+
+curvecpmakekey_SOURCES = \
+	curvecpmakekey.c
+
+curvecpclient_SOURCES = \
+	curvecpclient.c
+
+curvecpserver_SOURCES = \
+	curvecpserver.c
+
+curvecpmessage_SOURCES = \
+	curvecpmessage.c
+
+SUBDIRS = \
+	libcurvecp
--- a/src/libsodium/curvecp/curvecpclient.c
+++ b/src/libsodium/curvecp/curvecpclient.c
--- a/src/libsodium/curvecp/curvecpmakekey.c
+++ b/src/libsodium/curvecp/curvecpmakekey.c
--- a/src/libsodium/curvecp/curvecpmessage.c
+++ b/src/libsodium/curvecp/curvecpmessage.c
--- a/src/libsodium/curvecp/curvecpprintkey.c
+++ b/src/libsodium/curvecp/curvecpprintkey.c
--- a/src/libsodium/curvecp/curvecpserver.c
+++ b/src/libsodium/curvecp/curvecpserver.c
--- a/src/curvecp/libcurvecp/Makefile.am
+++ b/src/curvecp/libcurvecp/Makefile.am
@ -67,31 +67,3 @@ libcurvecp_la_LDFLAGS = \
 libcurvecp_la_CPPFLAGS = \
 	$(LTDLINCL) \
 	-I$(top_srcdir)/src/libsodium/include/sodium
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/libsodium/include/sodium
-
-LDADD = \
-	libcurvecp.la
-
-bin_PROGRAMS = \
-	curvecpprintkey \
-	curvecpmakekey \
-	curvecpclient \
-	curvecpserver \
-	curvecpmessage
-
-curvecpprintkey_SOURCES = \
-	curvecpprintkey.c
-
-curvecpmakekey_SOURCES = \
-	curvecpmakekey.c
-
-curvecpclient_SOURCES = \
-	curvecpclient.c
-
-curvecpserver_SOURCES = \
-	curvecpserver.c
-
-curvecpmessage_SOURCES = \
-	curvecpmessage.c
--- a/src/curvecp/libcurvecp/blocking.c
+++ b/src/curvecp/libcurvecp/blocking.c
--- a/src/curvecp/libcurvecp/blocking.h
+++ b/src/curvecp/libcurvecp/blocking.h
--- a/src/curvecp/libcurvecp/byte.h
+++ b/src/curvecp/libcurvecp/byte.h
--- a/src/curvecp/libcurvecp/byte_copy.c
+++ b/src/curvecp/libcurvecp/byte_copy.c
--- a/src/curvecp/libcurvecp/byte_isequal.c
+++ b/src/curvecp/libcurvecp/byte_isequal.c
--- a/src/curvecp/libcurvecp/byte_zero.c
+++ b/src/curvecp/libcurvecp/byte_zero.c
--- a/src/curvecp/libcurvecp/crypto_block.c
+++ b/src/curvecp/libcurvecp/crypto_block.c
--- a/src/curvecp/libcurvecp/crypto_block.h
+++ b/src/curvecp/libcurvecp/crypto_block.h
--- a/src/curvecp/libcurvecp/die.c
+++ b/src/curvecp/libcurvecp/die.c
--- a/src/curvecp/libcurvecp/die.h
+++ b/src/curvecp/libcurvecp/die.h
--- a/src/curvecp/libcurvecp/e.c
+++ b/src/curvecp/libcurvecp/e.c
--- a/src/curvecp/libcurvecp/e.h
+++ b/src/curvecp/libcurvecp/e.h
--- a/src/curvecp/libcurvecp/hexparse.c
+++ b/src/curvecp/libcurvecp/hexparse.c
--- a/src/curvecp/libcurvecp/hexparse.h
+++ b/src/curvecp/libcurvecp/hexparse.h
--- a/src/curvecp/libcurvecp/load.c
+++ b/src/curvecp/libcurvecp/load.c
--- a/src/curvecp/libcurvecp/load.h
+++ b/src/curvecp/libcurvecp/load.h
--- a/src/curvecp/libcurvecp/nameparse.c
+++ b/src/curvecp/libcurvecp/nameparse.c
--- a/src/curvecp/libcurvecp/nameparse.h
+++ b/src/curvecp/libcurvecp/nameparse.h
--- a/src/curvecp/libcurvecp/nanoseconds.c
+++ b/src/curvecp/libcurvecp/nanoseconds.c
--- a/src/curvecp/libcurvecp/nanoseconds.h
+++ b/src/curvecp/libcurvecp/nanoseconds.h
--- a/src/curvecp/libcurvecp/open.h
+++ b/src/curvecp/libcurvecp/open.h
--- a/src/curvecp/libcurvecp/open_cwd.c
+++ b/src/curvecp/libcurvecp/open_cwd.c
--- a/src/curvecp/libcurvecp/open_lock.c
+++ b/src/curvecp/libcurvecp/open_lock.c
--- a/src/curvecp/libcurvecp/open_pipe.c
+++ b/src/curvecp/libcurvecp/open_pipe.c
--- a/src/curvecp/libcurvecp/open_read.c
+++ b/src/curvecp/libcurvecp/open_read.c
--- a/src/curvecp/libcurvecp/open_write.c
+++ b/src/curvecp/libcurvecp/open_write.c
--- a/src/curvecp/libcurvecp/portparse.c
+++ b/src/curvecp/libcurvecp/portparse.c
--- a/src/curvecp/libcurvecp/portparse.h
+++ b/src/curvecp/libcurvecp/portparse.h
--- a/src/curvecp/libcurvecp/randommod.c
+++ b/src/curvecp/libcurvecp/randommod.c
--- a/src/curvecp/libcurvecp/randommod.h
+++ b/src/curvecp/libcurvecp/randommod.h
--- a/src/curvecp/libcurvecp/safenonce.c
+++ b/src/curvecp/libcurvecp/safenonce.c
--- a/src/curvecp/libcurvecp/safenonce.h
+++ b/src/curvecp/libcurvecp/safenonce.h
--- a/src/curvecp/libcurvecp/savesync.c
+++ b/src/curvecp/libcurvecp/savesync.c
--- a/src/curvecp/libcurvecp/savesync.h
+++ b/src/curvecp/libcurvecp/savesync.h
--- a/src/curvecp/libcurvecp/socket.h
+++ b/src/curvecp/libcurvecp/socket.h
--- a/src/curvecp/libcurvecp/socket_bind.c
+++ b/src/curvecp/libcurvecp/socket_bind.c
--- a/src/curvecp/libcurvecp/socket_recv.c
+++ b/src/curvecp/libcurvecp/socket_recv.c
--- a/src/curvecp/libcurvecp/socket_send.c
+++ b/src/curvecp/libcurvecp/socket_send.c
--- a/src/curvecp/libcurvecp/socket_udp.c
+++ b/src/curvecp/libcurvecp/socket_udp.c
--- a/src/curvecp/libcurvecp/uint16_pack.c
+++ b/src/curvecp/libcurvecp/uint16_pack.c
--- a/src/curvecp/libcurvecp/uint16_pack.h
+++ b/src/curvecp/libcurvecp/uint16_pack.h
--- a/src/curvecp/libcurvecp/uint16_unpack.c
+++ b/src/curvecp/libcurvecp/uint16_unpack.c
--- a/src/curvecp/libcurvecp/uint16_unpack.h
+++ b/src/curvecp/libcurvecp/uint16_unpack.h
--- a/src/curvecp/libcurvecp/uint32_pack.c
+++ b/src/curvecp/libcurvecp/uint32_pack.c
--- a/src/curvecp/libcurvecp/uint32_pack.h
+++ b/src/curvecp/libcurvecp/uint32_pack.h
--- a/src/curvecp/libcurvecp/uint32_unpack.c
+++ b/src/curvecp/libcurvecp/uint32_unpack.c
--- a/src/curvecp/libcurvecp/uint32_unpack.h
+++ b/src/curvecp/libcurvecp/uint32_unpack.h
--- a/src/curvecp/libcurvecp/uint64_pack.c
+++ b/src/curvecp/libcurvecp/uint64_pack.c
--- a/src/curvecp/libcurvecp/uint64_pack.h
+++ b/src/curvecp/libcurvecp/uint64_pack.h
--- a/src/curvecp/libcurvecp/uint64_unpack.c
+++ b/src/curvecp/libcurvecp/uint64_unpack.c
--- a/src/curvecp/libcurvecp/uint64_unpack.h
+++ b/src/curvecp/libcurvecp/uint64_unpack.h
--- a/src/curvecp/libcurvecp/writeall.c
+++ b/src/curvecp/libcurvecp/writeall.c
--- a/src/curvecp/libcurvecp/writeall.h
+++ b/src/curvecp/libcurvecp/writeall.h
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@ -93,5 +93,4 @@ libsodium_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/libsodium/include/sodium

 SUBDIRS = \
-	curvecp \
 	include