Fix syntax-check nits.

[platform/upstream/libtasn1.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 25332f0..a2fc98a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is part of LIBTASN1.
 #
@@ -18,38 +18,22 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-EXTRA_DIST = windows/asn1-parser/asn1-parser.vcproj            \
-       windows/asn1-parser/config.h windows/libtasn1.ncb       \
-       windows/libtasn1.sln windows/libtasn1.suo               \
-       windows/gnulib/getopt.h windows/gnulib/gnulib.vcproj    \
-       windows/libtasn1/libtasn1.vcproj                        \
-       windows/test-parser/test-parser.vcproj                  \
-       windows/test-tree/test-tree.vcproj
+EXTRA_DIST = windows/asn1-parser/asn1-parser.vcproj                    \
+       windows/asn1-parser/config.h windows/libtasn1.ncb               \
+       windows/libtasn1.sln windows/libtasn1.suo                       \
+       windows/gnulib/getopt.h windows/gnulib/gnulib.vcproj            \
+       windows/libtasn1/libtasn1.vcproj                                \
+       windows/test-parser/test-parser.vcproj                          \
+       windows/test-tree/test-tree.vcproj windows/libtasn14win.mk
 
-SUBDIRS = gl lib src tests doc
+SUBDIRS = gl lib src examples tests doc
 
-ACLOCAL_AMFLAGS = -I m4 -I gl/m4
+ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/glm4
 
-ChangeLog:
-       git log --pretty --numstat --summary | git2cl > ChangeLog
+EXTRA_DIST += cfg.mk maint.mk .clcopying
 
-htmldir = ../www-gnutls
-tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'`
+gnulib-update:
+       gnulib-tool --add-import --dir=. --lib=libgnu --source-base=lib/gllib --m4-base=lib/glm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=lgl --no-vc-files
 
-release:
-       ! git-tag -l $(tag) > /dev/null
-       rm -f ChangeLog
-       make ChangeLog
-       git commit -m Generated. ChangeLog
-       git-tag -u b565716f! -m $(VERSION) $(tag)
-       make dist
-       gpg -b $(distdir).tar.gz
-       gpg --verify $(distdir).tar.gz.sig
-       cd doc && ../build-aux/gendocs.sh -o ../$(htmldir)/manual/libtasn1/ $(PACKAGE) "Libtasn1"
-       cp -v doc/reference/html/*.{html,png,devhelp,css} $(htmldir)/manual/libtasn1/reference/
-       cp -v $(distdir).tar.gz{,.sig} $(htmldir)/releases/libtasn1/
-       scp $(distdir).tar.gz{,.sig} igloo.linux.gr:~ftp/pub/gnutls/libtasn1/
-       ssh igloo.linux.gr 'cd ~ftp/pub/gnutls/libtasn1/ && sha1sum *.tar.gz > CHECKSUMS'
-       cd $(htmldir) && \
-               cvs add -kb releases/libtasn1/$(distdir).tar.gz{,.sig} && \
-               cvs commit -m "Update." manual/libtasn1/ releases/libtasn1/
+dist-hook:
+       make -C doc/ compare-makefile