From 00228aa8398fd7dde1271af424fab1cb470c5f43 Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 9 Jun 2009 10:28:16 +0000 Subject: [PATCH] Fix make maintainer-clean for out-of-tree builds. git-svn-id: svn://svn.berlios.de/openocd/trunk@2172 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- Makefile.am | 24 ++++++++++++------------ doc/Makefile.am | 5 ++++- src/Makefile.am | 2 +- src/flash/Makefile.am | 2 +- src/helper/Makefile.am | 2 +- src/jtag/Makefile.am | 2 +- src/pld/Makefile.am | 2 +- src/server/Makefile.am | 2 +- src/svf/Makefile.am | 2 +- src/target/Makefile.am | 2 +- src/xsvf/Makefile.am | 2 +- 11 files changed, 25 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index 245b5e7f..52ba595e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,15 +58,15 @@ distclean-local: DISTCLEANFILES = doxygen.log MAINTAINERCLEANFILES = \ - configure \ - Makefile.in \ - depcomp \ - config.guess \ - config.sub \ - config.h.in \ - config.h.in~ \ - compile \ - ltmain.sh \ - missing \ - aclocal.m4 \ - install-sh + $(srcdir)/configure \ + $(srcdir)/Makefile.in \ + $(srcdir)/depcomp \ + $(srcdir)/config.guess \ + $(srcdir)/config.sub \ + $(srcdir)/config.h.in \ + $(srcdir)/config.h.in~ \ + $(srcdir)/compile \ + $(srcdir)/ltmain.sh \ + $(srcdir)/missing \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/install-sh diff --git a/doc/Makefile.am b/doc/Makefile.am index 0b1318a6..ce2d78d9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,4 +11,7 @@ dist-hook: cp -p $(srcdir)/manual/$$i/* $(distdir)/manual/$$i/; \ done -MAINTAINERCLEANFILES = Makefile.in mdate-sh texinfo.tex +MAINTAINERCLEANFILES = \ + $(srcdir)/Makefile.in \ + $(srcdir)/mdate-sh \ + $(srcdir)/texinfo.tex diff --git a/src/Makefile.am b/src/Makefile.am index c7c9e5ed..c9b265d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -89,4 +89,4 @@ if HTTPD libopenocd_la_LIBADD += -lmicrohttpd endif -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 2e532a8e..73f02bff 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -58,4 +58,4 @@ noinst_HEADERS = \ pic32mx.h \ avrf.h -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 15a27c3a..93df6058 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -60,4 +60,4 @@ startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD) # add startup_tcl.c to make clean list CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD) -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index 9896b8ec..cb444b3a 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -158,4 +158,4 @@ noinst_HEADERS = \ rlink/st7.h \ minidummy/jtag_minidriver.h -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am index 24e2c3d9..06d4fc4d 100644 --- a/src/pld/Makefile.am +++ b/src/pld/Makefile.am @@ -8,4 +8,4 @@ noinst_LTLIBRARIES = libpld.la noinst_HEADERS = pld.h xilinx_bit.h virtex2.h libpld_la_SOURCES = pld.c xilinx_bit.c virtex2.c -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 17e067d2..2f070075 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -42,4 +42,4 @@ EXTRA_DIST = \ httpd/Stylizer.java \ httpd/Stylizer.class -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am index 2709788f..4dbd57fa 100644 --- a/src/svf/Makefile.am +++ b/src/svf/Makefile.am @@ -8,4 +8,4 @@ noinst_LTLIBRARIES = libsvf.la noinst_HEADERS = svf.h libsvf_la_SOURCES = svf.c -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/target/Makefile.am b/src/target/Makefile.am index f28561de..70b4df78 100644 --- a/src/target/Makefile.am +++ b/src/target/Makefile.am @@ -98,4 +98,4 @@ nobase_dist_pkglib_DATA = nobase_dist_pkglib_DATA += xscale/debug_handler.bin nobase_dist_pkglib_DATA += ecos/at91eb40a.elf -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am index abc6b482..847fb807 100644 --- a/src/xsvf/Makefile.am +++ b/src/xsvf/Makefile.am @@ -8,4 +8,4 @@ noinst_LTLIBRARIES = libxsvf.la noinst_HEADERS = xsvf.h libxsvf_la_SOURCES = xsvf.c -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -- 2.39.5