From 334f3db787b0859a12b2fc0d2136d4adbe37f3c3 Mon Sep 17 00:00:00 2001 From: jayeshkrishna Date: Mon, 1 May 2017 12:05:31 -0500 Subject: [PATCH] Make sure clean cleans up obj dir When user runs "./case.build --clean atm" some files (Srcfiles, Depends etc) still remain in the atm build directory. This change was missed (changes in cesm Makefile was not ported to the acme Makefile) in ESMCI/cime#1140 Fixes #1474 [BFB] --- config/acme/machines/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/acme/machines/Makefile b/config/acme/machines/Makefile index 3a67df8f2ff..5cb30af56c0 100644 --- a/config/acme/machines/Makefile +++ b/config/acme/machines/Makefile @@ -836,22 +836,22 @@ $(COMPLIB): $(OBJS) cleanatm: $(RM) -f $(LIBROOT)/libatm.a - cd $(EXEROOT)/atm/obj; $(RM) -f *.o *.mod + $(RM) -fr $(EXEROOT)/atm/obj cleancpl: - cd $(EXEROOT)/cpl/obj; $(RM) -f *.o *.mod + $(RM) -fr $(EXEROOT)/cpl/obj cleanocn: $(RM) -f $(LIBROOT)/libocn.a - cd $(EXEROOT)/ocn/obj ; $(RM) -f *.o *.mod + $(RM) -fr $(EXEROOT)/ocn/obj cleanwav: $(RM) -f $(LIBROOT)/libwav.a - cd $(EXEROOT)/wav/obj ; $(RM) -f *.o *.mod + $(RM) -fr $(EXEROOT)/wav/obj cleanesp: $(RM) -f $(LIBROOT)/libesp.a - cd $(EXEROOT)/esp/obj ; $(RM) -f *.o *.mod + $(RM) -fr $(EXEROOT)/esp/obj cleanglc: $(RM) -f $(LIBROOT)/libglc.a @@ -859,15 +859,15 @@ cleanglc: cleanice: $(RM) -f $(LIBROOT)/libice.a - cd $(EXEROOT)/ice/obj ; $(RM) -f *.o *.mod + $(RM) -fr $(EXEROOT)/ice/obj cleanrof: $(RM) -f $(LIBROOT)/librof.a - cd $(EXEROOT)/rof/obj ; $(RM) -f *.o *.mod + $(RM) -fr $(EXEROOT)/rof/obj cleanlnd: $(RM) -f $(LIBROOT)/liblnd.a - cd $(EXEROOT)/lnd/obj ; $(RM) -f *.o *.mod + $(RM) -fr $(LNDOBJDIR) cleancsmshare: $(RM) -f $(CSMSHARELIB)