diff options
author | Simon Josefsson <simon@josefsson.org> | 2009-01-21 22:17:08 +0100 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2009-01-21 22:17:08 +0100 |
commit | 4836a00d05dece684b695959e12d96a55ed8c141 (patch) | |
tree | 104a14ae62d84a8434d76c025b7a50486cf58036 | |
parent | c2b856e2a40419a65ab2b49f63b5ae7d70e7d8a1 (diff) | |
download | gnutls-4836a00d05dece684b695959e12d96a55ed8c141.tar.gz |
Use -I's in libextra/gl for stdint.h.
-rw-r--r-- | libextra/gl/Makefile.am | 76 | ||||
-rw-r--r-- | libextra/gl/gnulib.mk | 59 | ||||
-rw-r--r-- | libextra/gl/m4/gnulib-cache.m4 | 6 |
3 files changed, 83 insertions, 58 deletions
diff --git a/libextra/gl/Makefile.am b/libextra/gl/Makefile.am index 12f8a4e924..893527e5c2 100644 --- a/libextra/gl/Makefile.am +++ b/libextra/gl/Makefile.am @@ -1,15 +1,23 @@ -## DO NOT EDIT! GENERATED AUTOMATICALLY! -## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2008 Free Software Foundation, Inc. +## Process this file with automake to produce Makefile.in +# Copyright (C) 2006, 2007 Free Software Foundation # -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. +# Author: Simon Josefsson # -# Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libxgnu --source-base=libextra/gl --m4-base=libextra/gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 +# This file is part of GNUTLS. +# +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. AUTOMAKE_OPTIONS = 1.5 gnits @@ -19,54 +27,12 @@ noinst_LTLIBRARIES = EXTRA_DIST = BUILT_SOURCES = SUFFIXES = -MOSTLYCLEANFILES = core *.stackdump +MOSTLYCLEANFILES = MOSTLYCLEANDIRS = CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = -AM_CPPFLAGS = - -noinst_LTLIBRARIES += libxgnu.la - -libxgnu_la_SOURCES = -libxgnu_la_LIBADD = $(xgl_LTLIBOBJS) -libxgnu_la_DEPENDENCIES = $(xgl_LTLIBOBJS) -EXTRA_libxgnu_la_SOURCES = -libxgnu_la_LDFLAGS = $(AM_LDFLAGS) - -## begin gnulib module crypto/hmac-md5 - - -EXTRA_DIST += hmac-md5.c hmac.h - -EXTRA_libxgnu_la_SOURCES += hmac-md5.c - -## end gnulib module crypto/hmac-md5 - -## begin gnulib module crypto/md5 - - -EXTRA_DIST += md5.c md5.h - -EXTRA_libxgnu_la_SOURCES += md5.c - -## end gnulib module crypto/md5 - -## begin gnulib module memxor - - -EXTRA_DIST += memxor.c memxor.h - -EXTRA_libxgnu_la_SOURCES += memxor.c - -## end gnulib module memxor - +AM_CPPFLAGS = -I$(top_srcdir)/lgl -I$(top_builddir)/lgl -mostlyclean-local: mostlyclean-generic - @for dir in '' $(MOSTLYCLEANDIRS); do \ - if test -n "$$dir" && test -d $$dir; then \ - echo "rmdir $$dir"; rmdir $$dir; \ - fi; \ - done; \ - : +include gnulib.mk diff --git a/libextra/gl/gnulib.mk b/libextra/gl/gnulib.mk new file mode 100644 index 0000000000..0bd31fc3a9 --- /dev/null +++ b/libextra/gl/gnulib.mk @@ -0,0 +1,59 @@ +## DO NOT EDIT! GENERATED AUTOMATICALLY! +## Process this file with automake to produce Makefile.in. +# Copyright (C) 2002-2009 Free Software Foundation, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# Reproduce by: gnulib-tool --import --dir=. --lib=libxgnu --source-base=libextra/gl --m4-base=libextra/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --makefile-name=gnulib.mk --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 + + +MOSTLYCLEANFILES += core *.stackdump + +noinst_LTLIBRARIES += libxgnu.la + +libxgnu_la_SOURCES = +libxgnu_la_LIBADD = $(xgl_LTLIBOBJS) +libxgnu_la_DEPENDENCIES = $(xgl_LTLIBOBJS) +EXTRA_libxgnu_la_SOURCES = +libxgnu_la_LDFLAGS = $(AM_LDFLAGS) + +## begin gnulib module crypto/hmac-md5 + + +EXTRA_DIST += hmac-md5.c hmac.h + +EXTRA_libxgnu_la_SOURCES += hmac-md5.c + +## end gnulib module crypto/hmac-md5 + +## begin gnulib module crypto/md5 + + +EXTRA_DIST += md5.c md5.h + +EXTRA_libxgnu_la_SOURCES += md5.c + +## end gnulib module crypto/md5 + +## begin gnulib module memxor + + +EXTRA_DIST += memxor.c memxor.h + +EXTRA_libxgnu_la_SOURCES += memxor.c + +## end gnulib module memxor + + +mostlyclean-local: mostlyclean-generic + @for dir in '' $(MOSTLYCLEANDIRS); do \ + if test -n "$$dir" && test -d $$dir; then \ + echo "rmdir $$dir"; rmdir $$dir; \ + fi; \ + done; \ + : diff --git a/libextra/gl/m4/gnulib-cache.m4 b/libextra/gl/m4/gnulib-cache.m4 index 7b1322911d..1787bd26cd 100644 --- a/libextra/gl/m4/gnulib-cache.m4 +++ b/libextra/gl/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2009 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU # General Public License. As a special exception to the GNU General @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libxgnu --source-base=libextra/gl --m4-base=libextra/gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 +# gnulib-tool --import --dir=. --lib=libxgnu --source-base=libextra/gl --m4-base=libextra/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --makefile-name=gnulib.mk --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -30,7 +30,7 @@ gl_PO_BASE([]) gl_DOC_BASE([doc]) gl_TESTS_BASE([tests]) gl_LIB([libxgnu]) -gl_MAKEFILE_NAME([]) +gl_MAKEFILE_NAME([gnulib.mk]) gl_LIBTOOL gl_MACRO_PREFIX([xgl]) gl_PO_DOMAIN([]) |