Skip to content

Commit

Permalink
Merge branch 'jayeshkrishna/cime_clean_component' (PR #1475)
Browse files Browse the repository at this point in the history
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]

* jayeshkrishna/cime_clean_component:
  Make sure clean clm cleans up obj dir
  Make sure clean <COMPONENT> cleans up obj dir
  • Loading branch information
jayeshkrishna committed May 12, 2017
2 parents 8af68c5 + fb48a19 commit 9f3ff86
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions cime/config/acme/machines/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -836,38 +836,38 @@ $(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
$(RM) -fr $(EXEROOT)/glc

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 $(EXEROOT)/lnd/obj

cleancsmshare:
$(RM) -f $(CSMSHARELIB)
Expand Down

0 comments on commit 9f3ff86

Please sign in to comment.