[pkg-opensc-commit] [pkcs11-helper] 154/253: More automake cleanups

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit 8bd5fd19a0efed18ef25a747e255de0d63c80990
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Thu Feb 7 20:12:33 2008 +0000

    More automake cleanups
---
 Makefile.am                        | 10 ++++------
 distro/debian/Makefile.am          |  6 ++----
 distro/rpm/Makefile.am             |  2 +-
 doc/api/Makefile.am                |  2 +-
 lib/Makefile.am                    | 14 +++++++-------
 tests/test-basic/Makefile.am       |  7 +++----
 tests/test-certificate/Makefile.am |  7 +++----
 tests/test-slotevent/Makefile.am   |  7 +++----
 8 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4f3e178..ed0195e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,15 +55,13 @@ AUTOMAKE_OPTIONS=foreign dist-bzip2
 
 SUBDIRS=man include lib m4dir doc distro tests
 
-dist_doc_DATA=README COPYING.GPL COPYING.BSD COPYING
+CLEANFILES=pkcs11-helper.spec
 
-EXTRA_DIST=config-w32-vc.h
+dist_doc_DATA=README COPYING.GPL COPYING.BSD COPYING
+noinst_HEADERS=config-w32-vc.h
 
 #
 # pkcs11-helper.spec must be on root for invalid RPM
 #
 dist-hook:
-	ln -s distro/rpm/pkcs11-helper.spec $(distdir)/pkcs11-helper.spec
-
-clean-generic:
-	-rm pkcs11-helper.spec
+	$(LN_S) distro/rpm/pkcs11-helper.spec $(distdir)/pkcs11-helper.spec
diff --git a/distro/debian/Makefile.am b/distro/debian/Makefile.am
index 2739138..511be0c 100644
--- a/distro/debian/Makefile.am
+++ b/distro/debian/Makefile.am
@@ -49,9 +49,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+CLEANFILES=copyright
 BUILT_SOURCES=copyright
 
-EXTRA_DIST= \
+dist_noinst_DATA= \
 	changelog \
 	README.build \
 	compat \
@@ -65,6 +66,3 @@ EXTRA_DIST= \
 
 copyright:	copyright.m4
 	$(M4) copyright.m4 > $@
-
-clean-local:
-	-rm copyright
diff --git a/distro/rpm/Makefile.am b/distro/rpm/Makefile.am
index 72d6f27..b0c1e04 100644
--- a/distro/rpm/Makefile.am
+++ b/distro/rpm/Makefile.am
@@ -49,4 +49,4 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-EXTRA_DIST=pkcs11-helper.spec
+dist_noinst_DATA=pkcs11-helper.spec
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 39fd742..49e2f93 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -49,7 +49,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-EXTRA_DIST=Doxyfile Doxyfile_footer.html *.dox *.gif
+dist_noinst_DATA=Doxyfile Doxyfile_footer.html *.dox *.gif
 
 if ENABLE_DOC
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9ff5df7..a82f8af 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -49,9 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-INCLUDES= \
-	-I$(top_srcdir)/include
-
 EXTRA_DIST= \
 	Makefile.w32-vc \
 	certificate.exports \
@@ -60,11 +57,17 @@ EXTRA_DIST= \
 	openssl.exports \
 	slotevent.exports \
 	token.exports
+CLEANFILES= \
+	pkcs11-helper.exports
 
 pkgconfig_DATA=libpkcs11-helper-1.pc
 
 lib_LTLIBRARIES=libpkcs11-helper.la
 BUILT_SOURCES=pkcs11-helper.exports
+
+INCLUDES= \
+	-I$(top_srcdir)/include
+
 nodist_libpkcs11_helper_la_SOURCES= \
 	pkcs11-helper.exports
 libpkcs11_helper_la_SOURCES= \
@@ -83,7 +86,7 @@ libpkcs11_helper_la_SOURCES= \
 	pkcs11h-serialization.c \
 	pkcs11h-openssl.c
 libpkcs11_helper_la_LDFLAGS= \
-	$(AM_LDFLAGS) $(LTLIBRARY_EXTRA_LDFLAGS) \
+	$(AM_LDFLAGS) \
 	-version-info @LIBPKCS11_HELPER_LT_CURRENT@:@LIBPKCS11_HELPER_LT_REVISION@:@LIBPKCS11_HELPER_LT_AGE@ \
 	-export-symbols pkcs11-helper.exports \
 	-no-undefined
@@ -129,9 +132,6 @@ mylib_DATA=.libs/libpkcs11-helper- at LIBPKCS11_HELPER_LT_CURRENT@.dll.def
 endif
 endif
 
-clean-generic:
-	-rm -fr pkcs11-helper.exports
-
 RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS)
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
diff --git a/tests/test-basic/Makefile.am b/tests/test-basic/Makefile.am
index e85a0d6..f3b3b9c 100644
--- a/tests/test-basic/Makefile.am
+++ b/tests/test-basic/Makefile.am
@@ -49,13 +49,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+TESTS=test-basic
+noinst_PROGRAMS=test-basic
+
 INCLUDES= \
 	-I$(top_srcdir)/include
-DEPS= \
-	$(top_builddir)/lib/libpkcs11-helper.la
 LDADD= \
 	$(top_builddir)/lib/libpkcs11-helper.la
 
-TESTS=test-basic
-noinst_PROGRAMS=test-basic
 test_basic_SOURCES=test-basic.c
diff --git a/tests/test-certificate/Makefile.am b/tests/test-certificate/Makefile.am
index 9b83705..4c7705d 100644
--- a/tests/test-certificate/Makefile.am
+++ b/tests/test-certificate/Makefile.am
@@ -49,13 +49,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+TESTS=test-certificate
+noinst_PROGRAMS=test-certificate
+
 INCLUDES= \
 	-I$(top_srcdir)/include
-DEPS= \
-	$(top_builddir)/lib/libpkcs11-helper.la
 LDADD= \
 	$(top_builddir)/lib/libpkcs11-helper.la
 
-TESTS=test-certificate
-noinst_PROGRAMS=test-certificate
 test_certificate_SOURCES=test-certificate.c
diff --git a/tests/test-slotevent/Makefile.am b/tests/test-slotevent/Makefile.am
index 63dc710..a464322 100644
--- a/tests/test-slotevent/Makefile.am
+++ b/tests/test-slotevent/Makefile.am
@@ -49,13 +49,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+TESTS=test-slotevent
+noinst_PROGRAMS=test-slotevent
+
 INCLUDES= \
 	-I$(top_srcdir)/include
-DEPS= \
-	$(top_builddir)/lib/libpkcs11-helper.la
 LDADD= \
 	$(top_builddir)/lib/libpkcs11-helper.la
 
-TESTS=test-slotevent
-noinst_PROGRAMS=test-slotevent
 test_slotevent_SOURCES=test-slotevent.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git