From 8e7bb5d0cec763da36796401a2e899e253224ad7 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 18 Apr 2013 15:24:07 +0200 Subject: [PATCH] Move sodium-specific files to a dedicated directory --- configure.ac | 2 +- src/libsodium/Makefile.am | 6 +++--- src/libsodium/{ => sodium}/core.c | 0 src/libsodium/{ => sodium}/utils.c | 0 src/libsodium/{ => sodium}/version.c | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename src/libsodium/{ => sodium}/core.c (100%) rename src/libsodium/{ => sodium}/utils.c (100%) rename src/libsodium/{ => sodium}/version.c (100%) diff --git a/configure.ac b/configure.ac index c43769ff..a3639d5c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.61]) AC_INIT([libsodium],[0.4],[https://github.com/jedisct1/libsodium]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([libltdl/config]) -AC_CONFIG_SRCDIR([src/libsodium/version.c]) +AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 50049204..11501e9d 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -3,7 +3,6 @@ lib_LTLIBRARIES = \ libsodium.la libsodium_la_SOURCES = \ - core.c \ crypto_core/hsalsa20/ref2/core_hsalsa20.c \ crypto_core/hsalsa20/ref2/crypto_core.h \ crypto_core/salsa20/ref/core_salsa20.c \ @@ -133,8 +132,9 @@ libsodium_la_SOURCES = \ randombytes/randombytes.c \ randombytes/salsa20/randombytes_salsa20_random.c \ randombytes/sysrandom/randombytes_sysrandom.c \ - utils.c \ - version.c + sodium/core.c \ + sodium/utils.c \ + sodium/version.c libsodium_la_LDFLAGS = \ $(AM_LDFLAGS) \ diff --git a/src/libsodium/core.c b/src/libsodium/sodium/core.c similarity index 100% rename from src/libsodium/core.c rename to src/libsodium/sodium/core.c diff --git a/src/libsodium/utils.c b/src/libsodium/sodium/utils.c similarity index 100% rename from src/libsodium/utils.c rename to src/libsodium/sodium/utils.c diff --git a/src/libsodium/version.c b/src/libsodium/sodium/version.c similarity index 100% rename from src/libsodium/version.c rename to src/libsodium/sodium/version.c