(trunk) Fixed problem with duplicate PHONY target. Fixed build_number…

… rebuilds when mod flags change.

git-svn-id: https://svn.code.sf.net/p/gridlab-d/code/trunk@5411 54b63ff4-7b51-0410-8bda-9fa96797e505

aminclude.mk

@@ -159,7 +159,7 @@ DX_CLEAN_LATEX = @DX_DOCDIR@/latex
 
 endif DX_COND_latex
 
-.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
+.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) buildnum
 
 .INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
 

core/Makefile.mk

@@ -166,6 +166,5 @@ pkginclude_HEADERS += core/version.h
 
 core/build.h: buildnum
 
-.PHONY: buildnum
-buildnum:
+buildnum: utilities/build_number
 	/bin/bash -c "source $(top_build_prefix)utilities/build_number $(top_srcdir) $(top_build_prefix)core/build.h"

utilities/build_number

@@ -25,7 +25,7 @@ fi
 if test -z "$oldnum" -o "$new" -ne "$oldnum" -o -z "$oldbranch" -o "$oldbranch" != "$branch" ; then 
 	echo "Updating $2: revision $new ($branch)"
 	echo "#define BUILDNUM $new" > $2
-	if test "${dir:0:6}" != "branch" ; then 
+	if test "${dir:0:6}" != "branch" -o ! -z "$mod" ; then 
 		echo "#define BRANCH \"$branch\"" >> $2
 	fi
 fi