aboutsummaryrefslogtreecommitdiffstats
path: root/keyserver/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'keyserver/Makefile.am')
-rw-r--r--keyserver/Makefile.am14
1 files changed, 8 insertions, 6 deletions
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index fd046cfc0..884b8eb2d 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -1,5 +1,5 @@
# Makefile.am - Makefile for keyservers
-# Copyright (C) 2001, 2002, 2004, 2005, 2006,
+# Copyright (C) 2001, 2002, 2004, 2005, 2006,
# 2009 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
@@ -8,12 +8,12 @@
# 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.
-#
+#
# GnuPG 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 program; if not, see <http://www.gnu.org/licenses/>.
## Process this file with automake to produce Makefile.in
@@ -26,7 +26,9 @@ EXTRA_PROGRAMS = gpg2keys_ldap gpg2keys_hkp gpg2keys_finger gpg2keys_curl \
gpg2keys_kdns
EXTRA_SCRIPTS = gpg2keys_mailto
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
+EXTRA_DIST = ChangeLog-2011
+
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
@@ -62,11 +64,11 @@ if FAKE_CURL
gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h
gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- $(other_libs)
+ $(other_libs)
gpg2keys_hkp_SOURCES += curl-shim.c curl-shim.h
gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- $(other_libs)
+ $(other_libs)
else
# Note that we need to include all other libs here as well because
# some compilers don't care about inline functions and insert