Commit 1152ed4d authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

The make clean command now removes test coverage folders. Fixes #2205. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6280 41f8697f-d340-4b68-9986-7bafba869bb8
parent ae026762

isis/make/isismake.apps

+3 −3
Original line number Diff line number Diff line
@@ -121,9 +121,9 @@ quickclean: localclean 
clean:  localclean

	$(RM) $(OBJS) $(BINS) $(PROTOSGEN) $(MOCGEN) `basename $(CURDIR)`.html \

	  $(UIHEADERS) $(QTRESOURCEFILES) *.csexe *.csmes;                     \

	$(RM) -r scopecoverage scopecoverage.html                              \

	         linecoverage linecoverage.html                                \

	         functioncoverage functioncoverage.html;                       \

	$(RM) -r scopecoverage scopecoverage.html scopecoverage_html           \

	         linecoverage linecoverage.html linecoverage_html              \

	         functioncoverage functioncoverage.html functioncoverage_html; \

	if [ -d "tsts" ];                                                      \

	then                                                                   \

	  if [ -f "tsts/Makefile" ];                                           \

isis/make/isismake.objs

+3 −3
Original line number Diff line number Diff line
@@ -231,9 +231,9 @@ clean: localclean 
	  $(UIHEADERS) $(ARCHIVELIB) $(SHAREDLIB) libisis$(ISISLIBVERSION).a  \

	  libisis$(ISISLIBVERSION).so libisis$(ISISLIBVERSION).dylib          \

	  unitTest.output;                                                    \

	$(RM) -rf html scopecoverage scopecoverage.html                       \

	  linecoverage linecoverage.html functioncoverage                     \

	  functioncoverage.html .objs *.csexe *.csmes

	$(RM) -rf html scopecoverage scopecoverage.html scopecoverage_html    \

	  linecoverage linecoverage.html linecoverage_html functioncoverage   \

	  functioncoverage.html functioncoverage_html .objs *.csexe *.csmes



localclean:

	if [ "$(findstring cleanlocal,$(shell $(GREP) cleanlocal Makefile))" = "cleanlocal" ]; \