diff --git a/ccid/Makefile.am b/ccid/Makefile.am
index 237c0c8..d6b6063 100644
--- a/ccid/Makefile.am
+++ b/ccid/Makefile.am
@@ -1,8 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src m4 patches
 
-DISTCLEANFILES = Doxyfile
-
 EXTRA_DIST = README.dox Doxyfile.in apdus
 
 do_subst = sed \
@@ -17,12 +15,11 @@ do_subst = sed \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
 if DOC_ENABLED
-clean-local:
-	rm -rf doc
-
+.PHONY: doc
 doc :
 	$(do_subst) < $(srcdir)/Doxyfile.in > Doxyfile
 	$(DOXYGEN) Doxyfile
-
-.PHONY: doc
 endif
+
+clean-local:
+	rm -rf doc Doxyfile
diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am
index 943475b..e995bc4 100644
--- a/ccid/src/Makefile.am
+++ b/ccid/src/Makefile.am
@@ -12,6 +12,17 @@ cats_test_SOURCES = cats-test.c pcscutil.c
 cats_test_LDADD = $(PCSC_LIBS)
 cats_test_CFLAGS = $(PCSC_CFLAGS)
 
+opensc:
+	cp -r $(top_srcdir)/src/opensc-$(OPENSCVERSION) opensc
+
+libopensc.la: opensc
+	cd opensc && ./configure $(OPENSC_CONFIGURE)
+	$(MAKE) -C opensc
+	cp opensc/src/libopensc/.libs/libopensc.* .
+
+clean-local:
+	rm -rf opensc libopensc.*
+
 bin_PROGRAMS =
 
 noinst_HEADERS = \
@@ -21,17 +32,6 @@ noinst_HEADERS = \
 		 ccid.h \
 		 usbstring.h
 
-opensc: opensc-$(OPENSCVERSION)
-	cd $(top_builddir)/src && cp -r opensc-$(OPENSCVERSION) opensc
-
-libopensc.la: opensc
-	cd $(top_builddir)/src/opensc && ./configure $(OPENSC_CONFIGURE)
-	$(MAKE) -C opensc
-	cp $(top_builddir)/src/opensc/src/libopensc/.libs/libopensc* $(top_builddir)/src
-
-flaw:
-	flawfinder -SQD *.h *.c
-
 if WITH_CCID
 bin_PROGRAMS += ccid-emulator
 endif
diff --git a/npa/Makefile.am b/npa/Makefile.am
index fadac87..c1943d2 100644
--- a/npa/Makefile.am
+++ b/npa/Makefile.am
@@ -1,8 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src m4
 
-DISTCLEANFILES = Doxyfile libpace.pc
-
 EXTRA_DIST = README.dox libpace.pc.in Doxyfile.in
 
 do_subst = sed \
@@ -31,17 +29,16 @@ win: opensc-0.11.13
 	    env OPENSSL_VERSION="1.0.0c_with_openpace-0.4.1" OPENSSL_URL="http://downloads.sourceforge.net/project/openpace/openssl-1.0.0c_with_openpace-0.4.1.tar.gz" EXTRA_OPENSSL_CONFIG="experimental-pace" ../opensc/installer_from_build.sh opensc/win32/build
 
 if DOC_ENABLED
-clean-local:
-	rm -rf doc
-
+.PHONY: doc
 doc :
 	$(do_subst) < $(srcdir)/Doxyfile.in > Doxyfile
 	$(DOXYGEN) Doxyfile
-
-.PHONY: doc
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpace.pc
-libpace.pc :
+libpace.pc:
 	$(do_subst) < $(srcdir)/libpace.pc.in > libpace.pc
+
+clean-local:
+	rm -rf doc Doxyfile libpace.pc
diff --git a/npa/src/Makefile.am b/npa/src/Makefile.am
index 3a7e685..108961d 100644
--- a/npa/src/Makefile.am
+++ b/npa/src/Makefile.am
@@ -11,21 +11,25 @@ libpace_la_CFLAGS = $(OPENSSL_CFLAGS)
 pace_tool_SOURCES = pace-tool.c binutil.c
 pace_tool_LDADD = $(OPENSSL_LIBS) libpace.la libopensc.la
 pace_tool_CFLAGS = $(OPENSSL_CFLAGS)
-noinst_HEADERS = \
-		 binutil.h
 
-opensc: opensc-$(OPENSCVERSION)
-	cd $(top_builddir)/src && cp -r opensc-$(OPENSCVERSION) opensc
+opensc:
+	cp -r $(top_srcdir)/src/opensc-$(OPENSCVERSION) opensc
 
 libopensc.la: opensc
-	cd $(top_builddir)/src/opensc && ./configure $(OPENSC_CONFIGURE)
+	cd opensc && ./configure $(OPENSC_CONFIGURE)
 	$(MAKE) -C opensc
-	cp $(top_builddir)/src/opensc/src/libopensc/.libs/libopensc* $(top_builddir)/src
+	cp opensc/src/libopensc/.libs/libopensc.* .
+
+clean-local:
+	rm -rf opensc libopensc.*
 
 bin_PROGRAMS = pace-tool
 
 lib_LTLIBRARIES = libpace.la
 
+noinst_HEADERS = \
+		 binutil.h
+
 nobase_include_HEADERS = \
 	pace/sm.h \
 	pace/pace.h \