Move CPP_PROG_LINK define from config.mk to rules.mk. This allows config.mk to be included in a Makefile before CPPSRCS is defined (i.e. Having CPP_PROG_LINK in config.mk caused an unnecessary dependency.)

config/config.mk

@@ -435,13 +435,6 @@ endif
 # we link statically or dynamic?  Assuming dynamic for now.
 LIBS_DIR = -L$(DIST)/bin
 
-#
-# Turn on C++ linking if we have any .cpp files
-#
-ifdef CPPSRCS
-CPP_PROG_LINK = 1
-endif
-
 # all public include files go in subdirectories of PUBLIC:
 PUBLIC		= $(XPDIST)/public
 

config/rules.mk

@@ -358,6 +358,15 @@ alltags:
 	rm -f TAGS
 	find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs etags -a
 
+#
+# Turn on C++ linking if we have any .cpp files
+# (moved this from config.mk so that config.mk can be included 
+#  before the CPPSRCS are defined)
+#
+ifdef CPPSRCS
+CPP_PROG_LINK = 1
+endif
+
 #
 # Define LINK_LINE here, since it gets used in two places.
 #