[asterisk-commits] Makefile: Remove coverage files on 'make clean' (asterisk[13])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: Makefile: Remove coverage files on 'make clean'
......................................................................


Makefile: Remove coverage files on 'make clean'

This patch updates a variety of Makefiles in Asterisk's build system to
remove .gcda and .gcno files when 'make clean' is executed. These files
are generated when '--enable-coverage' is passed to the Asterisk
configure script.

Change-Id: Ib70b41eea2ee2908885bff02e80faf9f40c84602
---
M Makefile.moddir_rules
M apps/Makefile
M channels/Makefile
M channels/misdn/Makefile
M pbx/Makefile
M res/Makefile
6 files changed, 13 insertions(+), 10 deletions(-)

Approvals:
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 8d83516..7f1c8c8 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -118,6 +118,7 @@
 	rm -f *.so *.o *.oo *.eo *.i *.ii
 	rm -f .*.d
 	rm -f *.s *.i
+	rm -f *.gcda *.gcno
 	rm -f modules.link
 
 install:: all
diff --git a/apps/Makefile b/apps/Makefile
index 1dfe8c8..1e8be04 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -28,7 +28,7 @@
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
 clean::
-	rm -f confbridge/*.o confbridge/*.i
+	rm -f confbridge/*.o confbridge/*.i confbridge/*.gcda confbridge/*.gcno
 
 $(if $(filter app_confbridge,$(EMBEDDED_MODS)),modules.link,app_confbridge.so): $(subst .c,.o,$(wildcard confbridge/*.c))
 $(subst .c,.o,$(wildcard confbridge/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,app_confbridge)
diff --git a/channels/Makefile b/channels/Makefile
index 1f4cff4..d1b895e 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -25,10 +25,10 @@
 
 clean::
 	$(MAKE) -C misdn clean
-	rm -f dahdi/*.o dahdi/*.i
-	rm -f sip/*.o sip/*.i
-	rm -f iax2/*.o iax2/*.i
-	rm -f pjsip/*.o pjsip/*.i
+	rm -f dahdi/*.o dahdi/*.i dahdi/*.gcda dahdi/*.gcno
+	rm -f sip/*.o sip/*.i sip/*.gcda sip/*.gcno
+	rm -f iax2/*.o iax2/*.i iax2/*.gcda iax2/*.gcno
+	rm -f pjsip/*.o pjsip/*.i pjsip/*.gcda pjsip/*.gcno
 
 $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): $(subst .c,.o,$(wildcard iax2/*.c))
 $(subst .c,.o,$(wildcard iax2/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_iax2)
diff --git a/channels/misdn/Makefile b/channels/misdn/Makefile
index 194bef5..96d5a2a 100644
--- a/channels/misdn/Makefile
+++ b/channels/misdn/Makefile
@@ -14,4 +14,4 @@
 	$(CC) -o $@ $^ -lisdnnet -lmISDN -lpthread
 
 clean:
-	rm -rf *.a *.o *.so portinfo *.i
+	rm -rf *.a *.o *.so portinfo *.i *.gcda *.gcno
diff --git a/pbx/Makefile b/pbx/Makefile
index 0afc4bc..a031cdf 100644
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -24,7 +24,7 @@
 endif
 
 clean::
-	rm -f ael/*.o ael/*.i
+	rm -f ael/*.o ael/*.i ael/*.gcda ael/*.gcno
 
 dundi-parser.o: dundi-parser.h
 dundi-parser.o: _ASTCFLAGS+=-I.
diff --git a/res/Makefile b/res/Makefile
index b98fb8e..dbab999 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -76,9 +76,11 @@
 ael/pval.o: ael/pval.c
 
 clean::
-	rm -f snmp/*.[oi] ael/*.[oi] ais/*.[oi] ari/*.[oi]
-	rm -f res_pjsip/*.[oi] stasis/*.[oi]
-	rm -f parking/*.o parking/*.i stasis_recording/*.[oi]
+	rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i snmp/*.gcda snmp/*.gcno ael/*.gcda ael/*.gcno
+	rm -f res_pjsip/*.[oi] res_pjsip/*.gcda res_pjsip/*.gcno
+	rm -f stasis/*.[oi] stasis/*.gcda stasis/*.gcno
+	rm -f parking/*.[oi] parking/*.gcda parking/*.gcno
+	rm -f stasis_recording/*.[oi] stasis_recording/*.gcda stasis_recording/*.gcno
 
 $(if $(filter res_parking,$(EMBEDDED_MODS)),modules.link,res_parking.so): $(subst .c,.o,$(wildcard parking/*.c))
 $(subst .c,.o,$(wildcard parking/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_parking)

-- 
To view, visit https://gerrit.asterisk.org/777
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib70b41eea2ee2908885bff02e80faf9f40c84602
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan <mjordan at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>