From 356644eb1a78f8bd59cf7b2f432c2a55ce05b576 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 24 May 2011 01:23:28 +0200 Subject: [PATCH] crypto/rijndael: Move AC_LIBOBJ invocations to module description. * m4/rijndael.m4: Remove file. * modules/crypto/rijndael (Files): Remove it. (configure.ac): Remove gl_RIJNDAEL call. (Makefile.am): Augment lib_SOURCES. --- ChangeLog | 8 ++++++++ m4/rijndael.m4 | 11 ----------- modules/crypto/rijndael | 3 +-- 3 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 m4/rijndael.m4 diff --git a/ChangeLog b/ChangeLog index 3d3c0d958..b6370c7db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-23 Bruno Haible + crypto/rijndael: Move AC_LIBOBJ invocations to module description. + * m4/rijndael.m4: Remove file. + * modules/crypto/rijndael (Files): Remove it. + (configure.ac): Remove gl_RIJNDAEL call. + (Makefile.am): Augment lib_SOURCES. + +2011-05-23 Bruno Haible + readtokens: Move AC_LIBOBJ invocations to module description. * m4/readtokens.m4 (gl_READTOKENS): Remove AC_LIBOBJ invocation. * modules/readtokens (Makefile.am): Augment lib_SOURCES. diff --git a/m4/rijndael.m4 b/m4/rijndael.m4 deleted file mode 100644 index 66c3b42a6..000000000 --- a/m4/rijndael.m4 +++ /dev/null @@ -1,11 +0,0 @@ -# rijndael.m4 serial 2 -dnl Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_RIJNDAEL], -[ - AC_LIBOBJ([rijndael-alg-fst]) - AC_LIBOBJ([rijndael-api-fst]) -]) diff --git a/modules/crypto/rijndael b/modules/crypto/rijndael index db9a6dfa9..c5feae6fa 100644 --- a/modules/crypto/rijndael +++ b/modules/crypto/rijndael @@ -6,15 +6,14 @@ lib/rijndael-alg-fst.c lib/rijndael-alg-fst.h lib/rijndael-api-fst.c lib/rijndael-api-fst.h -m4/rijndael.m4 Depends-on: stdint configure.ac: -gl_RIJNDAEL Makefile.am: +lib_SOURCES += rijndael-alg-fst.c rijndael-api-fst.c Include: "rijndael-alg-fst.h" -- 2.11.0