gEDA-cvs: pcb.git: branch: master updated (ca1af54230754bde0cda442a6d966a4aa1a3e6b4)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  ca1af54230754bde0cda442a6d966a4aa1a3e6b4 (commit)
       via  2eb25f8f7cc9584528b2caa54a6097fc17fcec8b (commit)
      from  d2a7382d1fcecd85a1feee399543a3e89fe1ef6b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 lib/Makefile.am   |    5 +++++
 tools/Makefile.am |    6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)


=================
 Commit Messages
=================

commit ca1af54230754bde0cda442a6d966a4aa1a3e6b4
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix make distcheck by removing regenerated newlib footprints
    
    The generated newlib files need to be removed by make distclean
    if they are being updated by the build process. If the files aren't
    being updated, we should not delete them as they were originally
    distributed with the source tarball.

:100644 100644 95be997... ae1b485... M	lib/Makefile.am

commit 2eb25f8f7cc9584528b2caa54a6097fc17fcec8b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix distribution of gnet-pcbfwd.scm in the dist tarball
    
    Use the dist_ prefix to make this simple, so our installed
    targets are now listed in dist_..._DATA, rather than ..._DATA
    and EXTRA_DIST.

:100644 100644 002fecc... d9665a9... M	tools/Makefile.am

=========
 Changes
=========

commit ca1af54230754bde0cda442a6d966a4aa1a3e6b4
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix make distcheck by removing regenerated newlib footprints
    
    The generated newlib files need to be removed by make distclean
    if they are being updated by the build process. If the files aren't
    being updated, we should not delete them as they were originally
    distributed with the source tarball.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 95be997..ae1b485 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -57,6 +57,11 @@ ${NEWLIB}.stamp : footprint.pcb ${NEWLIB_DEPS}
 		${PREVIEW} --pcb "${PCB}" --awk "${AWK}"
 	echo '${PREVIEW_MSG}' > $@
 
+# Remove any rebuilt footprints
+if BUILD_PCBLIB_NEWLIB
+distclean-local:
+	rm -fr ${NEWLIB}
+endif
 
 install-data-local: ${NEWLIB}.stamp
 	if test -d ${NEWLIB} ; then \

commit 2eb25f8f7cc9584528b2caa54a6097fc17fcec8b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix distribution of gnet-pcbfwd.scm in the dist tarball
    
    Use the dist_ prefix to make this simple, so our installed
    targets are now listed in dist_..._DATA, rather than ..._DATA
    and EXTRA_DIST.

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 002fecc..d9665a9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,12 +5,10 @@
 ## in ${exec_prefix}/bin  (by bin_SCRIPTS and bin_PROGRAMS)
 
 toolsdir=	$(pkgdatadir)/tools
-tools_DATA=	${TOOLS}
+dist_tools_DATA=	${TOOLS}
 
 scmdatadir = $(datadir)/gEDA/scheme
-scmdata_DATA = $(DIST_SCM)
-
-EXTRA_DIST= ${TOOLS}
+dist_scmdata_DATA = $(DIST_SCM)
 
 bin_SCRIPTS= \
 	MergePCBPS \




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs