aboutsummaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
Diffstat (limited to 'sm')
-rw-r--r--sm/ChangeLog-2011 (renamed from sm/ChangeLog)9
-rw-r--r--sm/Makefile.am10
2 files changed, 14 insertions, 5 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog-2011
index 7f7118ab0..4efea96d9 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 Werner Koch <[email protected]>
+
+ NB: ChangeLog files are no longer manually maintained. Starting
+ on December 1st, 2011 we put change information only in the GIT
+ commit log, and generate a top-level ChangeLog file from logs at
+ "make dist". See doc/HACKING for details.
+
2011-08-04 Werner Koch <[email protected]>
* keydb.c (keydb_add_resource): Remove set but unused var
@@ -1025,7 +1032,7 @@ h2007-11-22 Werner Koch <[email protected]>
2006-09-14 Werner Koch <[email protected]>
- Replaced all call gpg_error_from_errno(errno) by
+ Replaced all call gpg_error_from_errno(errno) by
gpg_error_from_syserror().
2006-09-13 Werner Koch <[email protected]>
diff --git a/sm/Makefile.am b/sm/Makefile.am
index 100c57b9f..d945d7151 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -6,12 +6,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/>.
@@ -20,9 +20,11 @@
bin_PROGRAMS = gpgsm
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
+EXTRA_DIST = ChangeLog-2011
+
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
include $(top_srcdir)/am/cmacros.am