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

[git@xxxxxxxxxx]

The branch, master has been updated
       via  13f7bcf0494cfa18815667af1c22debef51425a3 (commit)
      from  9309dfe4cc76e08ee66cc5320f321d87268dbce9 (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
=========

 configure.ac    |   11 +++++++++++
 doc/Makefile.am |    8 ++++----
 lib/Makefile.am |    5 ++---
 3 files changed, 17 insertions(+), 7 deletions(-)


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

commit 13f7bcf0494cfa18815667af1c22debef51425a3
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Provide better support for building from anoncvs sources.
    
    There were a few conditionals which turned on additional portions of the
    makefiles if it was determined that the build was from sources obtained
    via git.  Expand this to also detect if sources were from CVS since we
    still support anonymous cvs for tracking sources.

:100644 100644 0efe7da... 8104fc1... M	configure.ac
:100755 100755 177cd9c... 1228b33... M	doc/Makefile.am
:100644 100644 9825847... a3155da... M	lib/Makefile.am

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

commit 13f7bcf0494cfa18815667af1c22debef51425a3
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Provide better support for building from anoncvs sources.
    
    There were a few conditionals which turned on additional portions of the
    makefiles if it was determined that the build was from sources obtained
    via git.  Expand this to also detect if sources were from CVS since we
    still support anonymous cvs for tracking sources.

diff --git a/configure.ac b/configure.ac
index 0efe7da..8104fc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,17 @@ else
 fi
 AM_CONDITIONAL(GIT_VERSION, test x$pcb_git_version = xyes)
 
+AC_MSG_CHECKING([if you are building from a anoncvs checkout])
+pcb_cvs_version=no
+if test -f $srcdir/CVS/Root ; then
+	pcb_cvs_version=yes
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+fi
+AM_CONDITIONAL(CVS_VERSION, test x$pcb_cvs_version = xyes)
+AM_CONDITIONAL(GIT_OR_CVS_VERSION, test x$pcb_git_version = xyes -o x$pcb_cvs_version = xyes)
+
 ##########################################################################
 #
 # See if we are supposed to build the docs
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 177cd9c..1228b33 100755
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,7 +35,7 @@ info_TEXINFOS=	pcb.texi
 # to build the documentation.  Users who obtain the cutting edge sources
 # via GIT are considered to be doing "development" and incur a slightly
 # higher list of required tools.
-if GIT_VERSION
+if GIT_OR_CVS_VERSION
 pcb_TEXINFOS=	${inline_texi} ${pcb_output} ${tab_texi}
 else
 pcb_TEXINFOS=
@@ -56,7 +56,7 @@ pdf_docs=	${info_TEXINFOS:.texi=.pdf} refcard.pdf
 # time on the same input file.  That causes clashes in 
 # the .aux files which are used by both latex and
 # pdflatex.
-if GIT_VERSION
+if GIT_OR_CVS_VERSION
 refcard.pdf: refcard.ps
 pcb.pdf: pcb.ps
 endif
@@ -84,7 +84,7 @@ EXTRA_DIST= \
 	${tab_files} \
 	${tab_texi}
 
-if GIT_VERSION
+if GIT_OR_CVS_VERSION
 BUILT_SOURCES=	${tab_texi} ${pcb_output} ${inline_texi}
 CLEANFILES= \
 	refcard.aux refcard.dvi refcard.log refcard.pdf refcard.ps \
@@ -129,7 +129,7 @@ ${inline_texi} : extracted-docs
 # anyway.
 .PHONY : extracted-docs
 extracted-docs :
-if GIT_VERSION
+if GIT_OR_CVS_VERSION
 	${PERL} $(srcdir)/extract-docs $(srcdir)
 else
 	@echo "Skipping documentation extraction since you are not building from GIT sources"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9825847..a3155da 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,4 @@
 ## -*- makefile -*-
-## $Id$
 ##
 
 PCBLIBDIR=		@PCBLIBDIR@
@@ -43,7 +42,7 @@ else
 PREVIEW=	
 endif
 
-if GIT_VERSION
+if GIT_OR_CVS_VERSION
 NEWLIB_DEPS=	${LIBCONTENTS} ${srcdir}/m4lib_to_newlib.sh
 else
 NEWLIB_DEPS=
@@ -70,7 +69,7 @@ uninstall-local:
 
 EXTRA_DIST=	${NEWLIB} footprint.pcb ${NEWLIB}.stamp png_diff.sh
 
-if GIT_VERSION
+if GIT_OR_CVS_VERSION
 DISTCLEANFILES=	${NEWLIB}.stamp
 else
 DISTCLEANFILES=




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