Merge pull request #2 from qmx/rename

rename libnacl-ref -> libsodium

.gitignore

@@ -38,6 +38,6 @@ m4/lt~obsolete.m4
 man/*.html
 man/Makefile.in
 missing
-src/libnacl-ref/include/nacl/version.h
+src/libsodium/include/sodium/version.h
 stamp-*
 testing

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ([2.61])
-AC_INIT([libnacl-ref],[0.0.1],[https://github.com/jedisct1/libnacl-ref])
+AC_INIT([libsodium],[0.0.1],[https://github.com/jedisct1/libsodium])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([libltdl/config])
-AC_CONFIG_SRCDIR([src/libnacl-ref/randombytes/devurandom.c])
+AC_CONFIG_SRCDIR([src/libsodium/randombytes/devurandom.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
 AM_MAINTAINER_MODE
@@ -182,7 +182,7 @@ AC_ARG_WITH(safecode,
 ])
 
 AC_SUBST([MAINT])
-AC_SUBST([NACL_PATH])
+AC_SUBST([SODIUM_PATH])
 
 dnl Libtool.
 
@@ -199,8 +199,8 @@ AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile
-                 src/libnacl-ref/Makefile
-                 src/libnacl-ref/include/Makefile
-                 src/libnacl-ref/include/nacl/version.h])
+                 src/libsodium/Makefile
+                 src/libsodium/include/Makefile
+                 src/libsodium/include/sodium/version.h])
 
 AC_OUTPUT

src/Makefile.am

@@ -1,3 +1,3 @@
 
 SUBDIRS = \
-	libnacl-ref
+	libsodium

src/libnacl-ref/include/Makefile.am

@@ -1,42 +0,0 @@
-
-NACL_EXPORT = \
-	nacl/crypto_auth.h \
-	nacl/crypto_auth_hmacsha256.h \
-	nacl/crypto_auth_hmacsha512256.h \
-	nacl/crypto_box.h \
-	nacl/crypto_box_curve25519xsalsa20poly1305.h \
-	nacl/crypto_core_hsalsa20.h \
-	nacl/crypto_core_salsa20.h \
-	nacl/crypto_core_salsa2012.h \
-	nacl/crypto_core_salsa208.h \
-	nacl/crypto_hash.h \
-	nacl/crypto_hash_sha256.h \
-	nacl/crypto_hash_sha512.h \
-	nacl/crypto_hashblocks_sha256.h \
-	nacl/crypto_hashblocks_sha512.h \
-	nacl/crypto_onetimeauth.h \
-	nacl/crypto_onetimeauth_poly1305.h \
-	nacl/crypto_scalarmult_curve25519.h \
-	nacl/crypto_secretbox.h \
-	nacl/crypto_secretbox_xsalsa20poly1305.h \
-	nacl/crypto_sign.h \
-	nacl/crypto_sign_ed25519.h \
-	nacl/crypto_sign_edwards25519sha512batch.h \
-	nacl/crypto_stream.h \
-	nacl/crypto_stream_aes128ctr.h \
-	nacl/crypto_stream_salsa20.h \
-	nacl/crypto_stream_salsa2012.h \
-	nacl/crypto_stream_salsa208.h \
-	nacl/crypto_stream_xsalsa20.h \
-	nacl/crypto_uint16.h \
-	nacl/crypto_uint32.h \
-	nacl/crypto_uint64.h \
-	nacl/crypto_uint8.h \
-	nacl/crypto_verify_16.h \
-	nacl/crypto_verify_32.h \
-	nacl/randombytes.h
-
-EXTRA_SRC = $(NACL_EXPORT) \
-	nacl/version.h.in
-
-nobase_include_HEADERS = $(NACL_EXPORT)

src/libsodium/Makefile.am

@@ -1,8 +1,8 @@
 
 lib_LTLIBRARIES = \
-	libnacl.la
+	libsodium.la
 
-libnacl_la_SOURCES = \
+libsodium_la_SOURCES = \
 	randombytes/devurandom.c \
 	randombytes/devurandom.h \
 	crypto_core/hsalsa20/ref2/core_hsalsa20.c \
@@ -67,15 +67,15 @@ libnacl_la_SOURCES = \
 	crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h \
 	crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c
 
-libnacl_la_LDFLAGS = \
+libsodium_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-export-dynamic \
 	-no-undefined
 
-libnacl_la_CPPFLAGS = \
+libsodium_la_CPPFLAGS = \
 	$(LTDLINCL) \
 	-I. \
-	-Iinclude/nacl
+	-Iinclude/sodium
 
 SUBDIRS = \
 	include