# HG changeset patch # User Bruno Haible # Date 1306193008 -7200 # Node ID 1760605ebcdf7d2c083c8d5d3bb936bb5d6639ea # Parent 0722ede3f033d8949506e8476c2979180bfa00cc 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. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +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. diff --git a/m4/rijndael.m4 b/m4/rijndael.m4 deleted file mode 100644 --- 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 --- a/modules/crypto/rijndael +++ b/modules/crypto/rijndael @@ -6,15 +6,14 @@ 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"