From c7ea7bed66edd63f07a8c4fe1da29eda12ffeb3a Mon Sep 17 00:00:00 2001
From: Evan Ramos <evan@hpccharm.com>
Date: Thu, 25 Apr 2019 14:54:21 -0500
Subject: [PATCH] Fix duplicated building of TCharm .ci files

This issue occasionally leads to strange build failures in TCharm likely
due to this race condition.

Change-Id: I514c75963c14981533a37c4b97a35303a2559786
---
 src/libs/ck-libs/tcharm/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libs/ck-libs/tcharm/Makefile b/src/libs/ck-libs/tcharm/Makefile
index dbf8fda3bf..4b25455007 100644
--- a/src/libs/ck-libs/tcharm/Makefile
+++ b/src/libs/ck-libs/tcharm/Makefile
@@ -34,11 +34,15 @@ $(DEST2): $(OBJS2) $(HEADERS)
 $(COMPATLIB): $(COMPAT) 
 	$(CHARMC) $(COMPAT) -o $@
 
-tcharm.decl.h tcharm.def.h : tcharm.ci $(CDIR)/bin/charmxi
-	$(CHARMC) -c tcharm.ci
+tcharm.decl.h: tcharm.ci $(CDIR)/bin/charmxi
+	$(CHARMC) -c $<
 
-tcharmmain.decl.h tcharmmain.def.h: tcharmmain.ci $(CDIR)/bin/charmxi
-	$(CHARMC) -c tcharmmain.ci
+tcharm.def.h: tcharm.decl.h
+
+tcharmmain.decl.h: tcharmmain.ci $(CDIR)/bin/charmxi
+	$(CHARMC) -c $<
+
+tcharmmain.def.h: tcharmmain.decl.h
 
 headers: $(HEADERS)
 
-- 
2.11.4.GIT