From 1bb3ac2a0640ef2a26e019a575c73fa0d59e15e8 Mon Sep 17 00:00:00 2001 From: Christopher LaChance Date: Wed, 6 Dec 2017 13:12:13 -0600 Subject: [PATCH 1/6] Cleaned up 'make clean' output significantly. --- Makefile | 42 +++++++++++++------ share/trick/makefiles/Makefile.tricklib | 20 +++++++-- .../codegen/Interface_Code_Gen/makefile | 2 + .../Apps/ExternalPrograms/makefile | 2 + .../data_products/Apps/Trk2csv/makefile | 2 + .../data_products/DPX/APPS/FXPLOT/makefile | 2 + .../data_products/DPX/APPS/GXPLOT/makefile | 2 + trick_source/data_products/DPX/APPS/makefile | 12 +++--- trick_source/data_products/DPX/DPC/makefile | 8 ++++ trick_source/data_products/DPX/DPM/makefile | 2 + .../data_products/DPX/DPV/UTILS/makefile | 9 ++++ .../DPX/TESTING/DPC_TEST/makefile | 3 +- .../DPX/TESTING/DPM_TEST/makefile | 2 + .../data_products/DPX/TESTING/DS/makefile | 2 + .../DPX/TESTING/DS_exercisor/makefile | 2 + .../data_products/DPX/TESTING/TCDS/makefile | 3 +- .../data_products/DPX/TESTING/UDS/makefile | 3 +- .../data_products/DPX/TESTING/makefile | 12 +++--- trick_source/data_products/DPX/makefile | 11 +++-- trick_source/data_products/EQParse/makefile | 11 ++++- trick_source/data_products/Log/makefile | 11 ++++- trick_source/data_products/Var/makefile | 9 ++++ trick_source/data_products/makefile | 13 +++--- trick_source/data_products/units/makefile | 11 ++++- trick_source/java/makefile | 2 + trick_source/trick_swig/Makefile | 15 +++++-- 26 files changed, 166 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index ba43b81c..0cfc582f 100644 --- a/Makefile +++ b/Makefile @@ -134,6 +134,14 @@ endif # libraries. ICG_EXE := ${TRICK_HOME}/bin/trick-ICG +################################################################################ +# Formating Variables +################################################################################ + +# Appends a newline to the -w / --print-directories leaving message for make. +# This helps break up directory traversal into blocks. +MAKE_TRAVERSAL_NEWLINE := | sed '/^make.*: Leaving directory/a\ ' + ################################################################################ # RULES ################################################################################ @@ -269,43 +277,54 @@ sim_test: # CLEAN Targets ################################################################################ - clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG clean_java @/bin/rm -rf $(TRICK_BIN_DIR) @/bin/rm -rf $(TRICK_LIB_DIR) + @echo -e "\e[31m# #" + @echo -e "\e[33m## ##" + @echo -e "\e[32m### ###" + @echo -e "\e[34m#### ####" + @echo -e "\e[35m##### #####" + @echo -e "\e[39m-----Trick has been successfully cleaned.-----" + @echo -e "\e[35m##### #####" + @echo -e "\e[34m#### ####" + @echo -e "\e[32m### ###" + @echo -e "\e[33m## ##" + @echo -e "\e[31m# #\n" + ifeq ($(USE_ER7_UTILS), 1) clean: clean_er7_utils endif clean_sim_serv: @for i in $(SIM_SERV_DIRS) ; do \ - $(MAKE) -C $$i real_clean ; \ + $(MAKE) -C $$i real_clean $(MAKE_TRAVERSAL_NEWLINE); \ done - @ $(MAKE) -C ${TRICK_HOME}/trick_source/sim_services/mains real_clean + @ $(MAKE) -C ${TRICK_HOME}/trick_source/sim_services/mains real_clean $(MAKE_TRAVERSAL_NEWLINE) clean_er7_utils: make_er7_makefiles @for i in $(ER7_UTILS_DIRS) ; do \ - $(MAKE) -C $$i real_clean ; \ + $(MAKE) -C $$i real_clean $ $(MAKE_TRAVERSAL_NEWLINE); \ rm $$i/Makefile; \ done clean_utils: @for i in $(UTILS_DIRS) ; do \ - $(MAKE) -C $$i real_clean ; \ + $(MAKE) -C $$i real_clean $(MAKE_TRAVERSAL_NEWLINE); \ done clean_swig: @for i in $(SWIG_DIRS) ; do \ - $(MAKE) -C $$i real_clean ; \ + $(MAKE) -C $$i real_clean $(MAKE_TRAVERSAL_NEWLINE); \ done ifeq ($(USE_ER7_UTILS), 1) -clean_swig: make_er7_makefiles +clean_swig: make_er7_makefiles endif clean_ICG : - $(MAKE) -C ${TRICK_HOME}/trick_source/codegen/Interface_Code_Gen clean + @ $(MAKE) -C ${TRICK_HOME}/trick_source/codegen/Interface_Code_Gen clean $(MAKE_TRAVERSAL_NEWLINE) clean_unit_test: @/bin/rm -rf ${TRICK_HOME}/trick_test/*.xml @@ -314,14 +333,13 @@ clean_unit_test: done clean_doxygen: - @ $(MAKE) -C ${TRICK_HOME}/doxygen clean - + @ $(MAKE) -C ${TRICK_HOME}/doxygen clean $(MAKE_TRAVERSAL_NEWLINE) clean_dp: - @ $(MAKE) clean -C ${TRICK_HOME}/trick_source/data_products + @ $(MAKE) clean -C ${TRICK_HOME}/trick_source/data_products $(MAKE_TRAVERSAL_NEWLINE) clean_java: - @ $(MAKE) -C ${TRICK_HOME}/trick_source/java clean + @ $(MAKE) -C ${TRICK_HOME}/trick_source/java clean $(MAKE_TRAVERSAL_NEWLINE) # FIXME: Seems to me that the for loop below should be removed and that the diff --git a/share/trick/makefiles/Makefile.tricklib b/share/trick/makefiles/Makefile.tricklib index f9162d69..603ed2ba 100644 --- a/share/trick/makefiles/Makefile.tricklib +++ b/share/trick/makefiles/Makefile.tricklib @@ -161,6 +161,12 @@ $(Y_OBJS) : $(OBJ_DIR)/%.tab.o : $(SRC_DIR)%.tab.c | $(OBJ_DIR) $(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${ Date: Thu, 7 Dec 2017 15:10:39 -0600 Subject: [PATCH 2/6] Updated formating and replaced formating variables. --- Makefile | 15 ++++---------- share/trick/makefiles/Makefile.tricklib | 20 +++++-------------- trick_source/data_products/DPX/DPC/makefile | 7 ------- .../data_products/DPX/DPV/UTILS/makefile | 10 ++-------- trick_source/data_products/EQParse/makefile | 9 +-------- trick_source/data_products/Log/makefile | 9 +-------- trick_source/data_products/Var/makefile | 9 +-------- trick_source/data_products/units/makefile | 9 +-------- trick_source/trick_swig/Makefile | 14 +++---------- 9 files changed, 18 insertions(+), 84 deletions(-) diff --git a/Makefile b/Makefile index 0cfc582f..dcaeb0ad 100644 --- a/Makefile +++ b/Makefile @@ -281,17 +281,10 @@ clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG clean_java @/bin/rm -rf $(TRICK_BIN_DIR) @/bin/rm -rf $(TRICK_LIB_DIR) - @echo -e "\e[31m# #" - @echo -e "\e[33m## ##" - @echo -e "\e[32m### ###" - @echo -e "\e[34m#### ####" - @echo -e "\e[35m##### #####" - @echo -e "\e[39m-----Trick has been successfully cleaned.-----" - @echo -e "\e[35m##### #####" - @echo -e "\e[34m#### ####" - @echo -e "\e[32m### ###" - @echo -e "\e[33m## ##" - @echo -e "\e[31m# #\n" + @echo -e "\e[32m####################################" + @echo -e "\e[32mTrick has been successfully cleaned." + @echo -e "\e[32m####################################\e[0m\n" + ifeq ($(USE_ER7_UTILS), 1) clean: clean_er7_utils diff --git a/share/trick/makefiles/Makefile.tricklib b/share/trick/makefiles/Makefile.tricklib index 603ed2ba..14b12434 100644 --- a/share/trick/makefiles/Makefile.tricklib +++ b/share/trick/makefiles/Makefile.tricklib @@ -160,16 +160,7 @@ $(L_OBJS) : $(OBJ_DIR)/%.lex.o : $(SRC_DIR)%.lex.c $(SRC_DIR)%.tab.h | $(OBJ_DI $(Y_OBJS) : $(OBJ_DIR)/%.tab.o : $(SRC_DIR)%.tab.c | $(OBJ_DIR) $(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${> $(DEPTEMPFILE) @@ -178,17 +169,17 @@ depend: @ echo "Created dependency file $(DEPFILE)" io_clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" $(RM) -rf io_src - $(DEFAULT_COLOR) + @ echo -e "\e[0m\c" clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" $(RM) -rf $(OBJ_DIR) $(L_C) $(Y_C) $(Y_H) - $(DEFAULT_COLOR) + @ echo -e "\e[0m\c" real_clean: clean io_clean - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" $(RM) -rf xml *~ *.bak core @ echo -e "\e[32mDirectory cleaned.\e[0m" @@ -206,4 +197,3 @@ Source Directory Make Options:\n\ \n\ make real_clean - Deletes xml/, io_src/,\n\ and object_${TRICK_HOST_CPU}/ directories\n" - diff --git a/trick_source/data_products/DPX/DPC/makefile b/trick_source/data_products/DPX/DPC/makefile index 400f361c..6e5a0aac 100644 --- a/trick_source/data_products/DPX/DPC/makefile +++ b/trick_source/data_products/DPX/DPC/makefile @@ -33,12 +33,6 @@ endif ifeq ($(TRICK_HOST_TYPE), Darwin) endif -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -65,4 +59,3 @@ clean: spotless: clean ${RM} ${LIBDIR}/${LIBNAME} - diff --git a/trick_source/data_products/DPX/DPV/UTILS/makefile b/trick_source/data_products/DPX/DPV/UTILS/makefile index 8fc48ca1..33db54eb 100644 --- a/trick_source/data_products/DPX/DPV/UTILS/makefile +++ b/trick_source/data_products/DPX/DPV/UTILS/makefile @@ -19,12 +19,6 @@ LIBOBJS = ${OBJDIR}/DPV_textbuffer.o #.cpp.o: # ${CPP} ${CFLAGS} ${INCDIRS} -c $< -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - all: ${LIBDIR}/${LIBNAME} $(LIBOBJS): $(OBJDIR)/%.o : %.cpp | ${OBJDIR} @@ -40,11 +34,11 @@ ${LIBDIR}: mkdir -p ${LIBDIR} clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" ${RM} *~ ${RM} *.o ${RM} ${OBJDIR} - $(DEFAULT_COLOR) + @ echo -e "\e[0m\c" @ echo -e "\e[32mDirectory cleaned.\e[0m" spotless: clean diff --git a/trick_source/data_products/EQParse/makefile b/trick_source/data_products/EQParse/makefile index 99d6163e..e647f96e 100644 --- a/trick_source/data_products/EQParse/makefile +++ b/trick_source/data_products/EQParse/makefile @@ -63,12 +63,6 @@ IO_OBJS = $(IO_C_OBJS) $(IO_CPP_OBJS) OBJECT_FILES = $(IO_OBJS) $(C_OBJS) $(CPP_OBJS) $(F_OBJS) -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -99,10 +93,9 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/Log/makefile b/trick_source/data_products/Log/makefile index fdb85b34..c1f9b066 100644 --- a/trick_source/data_products/Log/makefile +++ b/trick_source/data_products/Log/makefile @@ -49,12 +49,6 @@ ifeq ($(TRICK_DP_FORCE_32BIT), 1) DP_CFLAGS += -m32 endif -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -71,10 +65,9 @@ $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) | $(LIBDIR) ar crs $(LIBDIR)/$(LIBNAME) $? clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/Var/makefile b/trick_source/data_products/Var/makefile index 6b36b93c..769cbd28 100644 --- a/trick_source/data_products/Var/makefile +++ b/trick_source/data_products/Var/makefile @@ -39,12 +39,6 @@ MAKEFILE = makefile AWKTEMPFILE = awk.temp MAKEDEPEND = makedepend -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -67,10 +61,9 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/units/makefile b/trick_source/data_products/units/makefile index 22d5acf3..c16725a8 100644 --- a/trick_source/data_products/units/makefile +++ b/trick_source/data_products/units/makefile @@ -28,12 +28,6 @@ ifeq ($(TRICK_DP_FORCE_32BIT), 1) DP_CFLAGS += -m32 endif -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -52,10 +46,9 @@ $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) $(C_OBJECTS) $(LIBDIR) ar crs $(LIBDIR)/$(LIBNAME) $(CPP_OBJECTS) $(C_OBJECTS) clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/trick_swig/Makefile b/trick_source/trick_swig/Makefile index 4ec9097f..2d74c2df 100644 --- a/trick_source/trick_swig/Makefile +++ b/trick_source/trick_swig/Makefile @@ -81,25 +81,17 @@ $(SWIG_SRC_FILES): swig_${TRICK_HOST_CPU}/%_wrap.cpp : %.i $(TRICK_LIB) : $(SWIG_OBJECT_FILES) $(OBJECT_FILES) ar crs $@ $? -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" -MESSAGE_COLOR := @ echo -e "\e[32m\c" - real_clean: clean clean: clean_python - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" $(RM) -rf $(OBJ_DIR) $(TEST_DIR) $(PY_FILES) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" clean_python: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf swig_${TRICK_HOST_CPU} sim_services.py swig_double.py swig_int.py swig_ref.py - $(DEFAULT_COLOR) + @ echo -e "\e[0m\c" # some depends swig_int_wrap.cpp: swig_int.cpp From 5e8cb8649f6bb85631ba45d16d3704c3613487a3 Mon Sep 17 00:00:00 2001 From: Christopher LaChance Date: Tue, 12 Dec 2017 12:01:35 -0600 Subject: [PATCH 3/6] Added formating to the core makefile. Trick compilation is now visually broken into sections. --- Makefile | 29 ++++++++++++++++++++++--- trick_source/data_products/DPX/makefile | 12 +++++----- trick_source/data_products/makefile | 8 ++++--- trick_source/java/makefile | 6 ++--- 4 files changed, 41 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index dcaeb0ad..e9642ccc 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,10 @@ MAKE_TRAVERSAL_NEWLINE := | sed '/^make.*: Leaving directory/a\ ' # DEFAULT TARGET # 1 Build Trick-core and Trick Data-products. all: no_dp dp - @ echo ; echo "Trick compilation complete:" ; date + @ echo -e "\n\e[32m#####################################\e[0m" + @ echo -e "\e[32mTrick has been successfully compiled.\e[34m" + @date + @ echo -e "\e[32m#####################################\e[0m\n" ifeq ($(USE_JAVA), 1) all: java @@ -157,35 +160,45 @@ endif #------------------------------------------------------------------------------- # 1.1 Build Trick-core no_dp: $(TRICK_LIB) $(TRICK_SWIG_LIB) - @ echo ; echo "Trick libs compiled:" ; date + @ echo -e "\e[32mTrick libraries compiled:\e[34m" ; date ; echo -e "\e[0m" # 1.1.1 Build libTrick.a $(TRICK_LIB): $(SIM_SERV_DIRS) $(UTILS_DIRS) | $(TRICK_LIB_DIR) + @ echo -e "\e[34m[---Building $@---]\e[0m" ar crs $@ $(SIM_SERV_OBJS) $(UTILS_OBJS) + @ echo "" ifeq ($(USE_ER7_UTILS), 1) ER7_UTILS_LIB = $(TRICK_LIB_DIR)/liber7_utils.a no_dp: $(ER7_UTILS_LIB) $(ER7_UTILS_LIB): $(ER7_UTILS_DIRS) | $(TRICK_LIB_DIR) + @ echo -e "\e[34m[---Building $@---]\e[0m" ar crs $@ $(ER7_UTILS_OBJS) + @ echo "" endif # 1.1.1.1 Compile the objects in the specified sim_services directories. .PHONY: $(SIM_SERV_DIRS) $(SIM_SERV_DIRS): icg_sim_serv $(TRICK_LIB_DIR) + @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ trick + @ echo "" # 1.1.1.2 Compile the objects in the specified utils directories. .PHONY: $(UTILS_DIRS) $(UTILS_DIRS): icg_sim_serv + @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ trick + @ echo "" # 1.1.1.3 Compile the objects in the specified er7_utils directories. .PHONY: $(ER7_UTILS_DIRS) $(ER7_UTILS_DIRS): TRICK_CXXFLAGS += -Wno-unused-parameter $(ER7_UTILS_DIRS): make_er7_makefiles icg_sim_serv + @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ trick + @ echo "" .PHONY: make_er7_makefiles make_er7_makefiles: @@ -201,11 +214,15 @@ endif # header files. .PHONY: icg_sim_serv icg_sim_serv: $(ICG_EXE) + @ echo -e "\e[34m[---Generating Interface Code---]\e[0m" ${TRICK_HOME}/bin/trick-ICG -s -m ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh + @ echo "" # 1.1.1.4.1 Build the Interface Code Generator (ICG) executable. $(ICG_EXE) : + @ echo -e "\e[34m[---Building Interface Code Generator---]\e[0m" $(MAKE) -C trick_source/codegen/Interface_Code_Gen + @ echo "" # 1.1.1.5 Create Trick Library directory. $(TRICK_LIB_DIR): @@ -213,17 +230,23 @@ $(TRICK_LIB_DIR): # 1.1.2 Build libTrick_pyip.a (Swig Lib) $(TRICK_SWIG_LIB): $(SWIG_DIRS) | $(TRICK_LIB_DIR) + @ echo -e "\e[34m[---Building $@---]\e[0m" ar crs $@ $(SWIG_OBJS) + @ echo "" .PHONY: $(SWIG_DIRS) $(SWIG_DIRS): icg_sim_serv $(TRICK_LIB_DIR) + @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ trick + @ echo "" #------------------------------------------------------------------------------- # 1.2 Build Trick's Data-products Applications. .PHONY: dp dp: ${TRICK_HOME}/trick_source/trick_utils/units + @ echo -e "\e[34m[---Building Data-Products Applications---]\e[0m" @ $(MAKE) -C ${TRICK_HOME}/trick_source/data_products + @ echo "" #------------------------------------------------------------------------------- # 1.3 Build Trick's Java Tools @@ -258,7 +281,7 @@ premade: ################################################################################ # This target runs Trick's Unit-tests and simulation-tests. test: unit_test sim_test - @ echo "All tests completed sucessfully" + @ echo -e "\e[33mAll unit tests completed sucessfully.\e[0m" .PHONY: $(UNIT_TEST_DIRS) $(UNIT_TEST_DIRS): diff --git a/trick_source/data_products/DPX/makefile b/trick_source/data_products/DPX/makefile index e84bc643..4df47a2c 100644 --- a/trick_source/data_products/DPX/makefile +++ b/trick_source/data_products/DPX/makefile @@ -23,21 +23,23 @@ all: $(LIBDIRS) $(APPDIRS) always_make: docs: always_make - @echo "===== Making DOCS =====" + @ echo -e "\e[34m[---Making Documentation---]\e[0m" doxygen DPX.doxygen testing: $(LIBDIRS) - @echo "===== Making TESTING =====" + @ echo -e "\e[34m[---Building TESTING---]\e[0m" $(MAKE) -C TESTING + @ echo "" $(LIBDIRS): - @ echo ; echo "==: Compile $@" + @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ + @ echo "" $(APPDIRS): $(LIBDIRS) - @echo "===== Making APPS =====" - @ echo ; echo "==: Compile $@" + @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ + @ echo "" clean: @ for i in $(LIBDIRS) ; do \ diff --git a/trick_source/data_products/makefile b/trick_source/data_products/makefile index 9146d77d..fe77c0cd 100644 --- a/trick_source/data_products/makefile +++ b/trick_source/data_products/makefile @@ -22,17 +22,19 @@ APPDIRS = DPX \ Apps/ExternalPrograms all: $(LIBDIRS) $(APPDIRS) - @ echo "== Trick data_products make complete ==" + @ echo -e "\e[32mTrick data-products compiled:\e[34m" ; date ; echo -e "\e[0m" .PHONY: $(LIBDIRS) $(APPDIRS) $(LIBDIRS): - @ echo ; echo "==: Compile data_products/$@" + @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ + @ echo "" $(APPDIRS): $(LIBDIRS) - @ echo ; echo "==: Compile data_products/$@" + @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ + @ echo "" real_clean: clean diff --git a/trick_source/java/makefile b/trick_source/java/makefile index 3c9a22e3..53bf3a57 100644 --- a/trick_source/java/makefile +++ b/trick_source/java/makefile @@ -24,13 +24,13 @@ RESOURCES = $(subst src/,,$(shell find src/trick -name resources)) RESOURCES += $(subst src/,,$(shell find src/trick -name jaxb.index)) all: ${DIST_DIR}/trick.jar resources - @echo "Java build successful" + @ echo -e "\n\e[32mTrick GUIs compiled:\e[34m" ; date ; echo -e "\e[0m" ${DEST_DIR} ${DIST_DIR} ${RESOURCES_DIR} ${DOCS_API_DIR}: mkdir -p $@ ${DIST_DIR}/trick.jar: compile ${DIST_DIR} - @echo "Creating jar file..." + @echo -e "\e[34m[---Creating Trick JAR---]\e[0m" @jar cf ${DIST_DIR}/trick.jar -C ${DEST_DIR} . @cd ${SRC_DIR} && jar uf ${DIST_DIR}/trick.jar ${RESOURCES} @@ -38,7 +38,7 @@ external_jars: @ $(MAKE) -C $(LIB_DIR) compile: ${DEST_DIR} external_jars - @echo "Building Trick GUIs..." + @echo -e "\e[34m[---Building Trick GUIs---]\e[0m" @${JAVAC} ${JAVAC_FLAGS} -classpath ${CLASS_PATH} -d ${DEST_DIR} -sourcepath ${SRC_DIR} ${SRC_FILES} resources: ${RESOURCES_DIR}/trick_icon.png From fbd9d3237feadefca9418f8a5217331a51771ca9 Mon Sep 17 00:00:00 2001 From: Christopher LaChance Date: Wed, 13 Dec 2017 11:04:00 -0600 Subject: [PATCH 4/6] Cleaned up 'make' target display further. --- Makefile | 1 + trick_source/data_products/DPX/APPS/GXPLOT/makefile | 1 - trick_source/java/makefile | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e9642ccc..f4c94d60 100644 --- a/Makefile +++ b/Makefile @@ -251,6 +251,7 @@ dp: ${TRICK_HOME}/trick_source/trick_utils/units #------------------------------------------------------------------------------- # 1.3 Build Trick's Java Tools java: + @ echo -e "\e[34m[---Building Java Tools---]\e[0m" @ $(MAKE) -C ${TRICK_HOME}/trick_source/java .PHONY: javadoc diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/makefile b/trick_source/data_products/DPX/APPS/GXPLOT/makefile index 18dd840c..bc5fd9b1 100644 --- a/trick_source/data_products/DPX/APPS/GXPLOT/makefile +++ b/trick_source/data_products/DPX/APPS/GXPLOT/makefile @@ -55,7 +55,6 @@ OBJECT_FILES = $(C_OBJECT_FILES) $(CXX_OBJECT_FILES) all: ${TRICK_HOME}/bin/trick-gxplot ${TRICK_HOME}/bin/trick-gxplot: ${LIBDIR}/libDPM.a ${LIBDIR}/libDPC.a ${LIBDIR}/libDPV.a $(OBJECT_FILES) - @echo "===== Making gxplot =====" ${CPP} ${CFLAGS} ${INCDIRS} -o $@ $(OBJECT_FILES) $(ALL_LIBS) ${XLIBS} ${LIBRTDEF} ${CONTROLLER_LIBS} -lDPV $(C_OBJECT_FILES) : $(OBJDIR)/%.o : %.c diff --git a/trick_source/java/makefile b/trick_source/java/makefile index 53bf3a57..dd180f99 100644 --- a/trick_source/java/makefile +++ b/trick_source/java/makefile @@ -30,7 +30,6 @@ ${DEST_DIR} ${DIST_DIR} ${RESOURCES_DIR} ${DOCS_API_DIR}: mkdir -p $@ ${DIST_DIR}/trick.jar: compile ${DIST_DIR} - @echo -e "\e[34m[---Creating Trick JAR---]\e[0m" @jar cf ${DIST_DIR}/trick.jar -C ${DEST_DIR} . @cd ${SRC_DIR} && jar uf ${DIST_DIR}/trick.jar ${RESOURCES} @@ -38,7 +37,6 @@ external_jars: @ $(MAKE) -C $(LIB_DIR) compile: ${DEST_DIR} external_jars - @echo -e "\e[34m[---Building Trick GUIs---]\e[0m" @${JAVAC} ${JAVAC_FLAGS} -classpath ${CLASS_PATH} -d ${DEST_DIR} -sourcepath ${SRC_DIR} ${SRC_FILES} resources: ${RESOURCES_DIR}/trick_icon.png From 6a03acfb4268c1a5b80d06ad11c3bda8844a485a Mon Sep 17 00:00:00 2001 From: Christopher LaChance Date: Wed, 13 Dec 2017 11:09:02 -0600 Subject: [PATCH 5/6] Reformated unit test compilation success message. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f4c94d60..b36c38ac 100644 --- a/Makefile +++ b/Makefile @@ -282,7 +282,9 @@ premade: ################################################################################ # This target runs Trick's Unit-tests and simulation-tests. test: unit_test sim_test - @ echo -e "\e[33mAll unit tests completed sucessfully.\e[0m" + @ echo -e "\n\e[32m#####################################" + @ echo -e "\e[32mAll unit tests completed sucessfully.\e[0m" + @ echo -e "\e[32m#####################################\n" .PHONY: $(UNIT_TEST_DIRS) $(UNIT_TEST_DIRS): From 9dd302f4b18c82140de027562d8c6faf8b324bad Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Thu, 1 Mar 2018 08:51:57 -0600 Subject: [PATCH 6/6] Trick makefile output formatting and cleanup. #533 Removed the red from the clean rules. We'd like to reserve red for errors. Ended up removing all color from the clean side. --- Makefile | 14 -------------- share/trick/makefiles/Makefile.tricklib | 6 ------ trick_source/codegen/Interface_Code_Gen/makefile | 2 -- .../data_products/Apps/ExternalPrograms/makefile | 2 -- trick_source/data_products/Apps/Trk2csv/makefile | 2 -- .../data_products/DPX/APPS/FXPLOT/makefile | 2 -- .../data_products/DPX/APPS/GXPLOT/makefile | 2 -- trick_source/data_products/DPX/DPC/makefile | 2 -- trick_source/data_products/DPX/DPM/makefile | 2 -- trick_source/data_products/DPX/DPV/UTILS/makefile | 3 --- .../data_products/DPX/TESTING/DPC_TEST/makefile | 2 -- .../data_products/DPX/TESTING/DPM_TEST/makefile | 2 -- trick_source/data_products/DPX/TESTING/DS/makefile | 2 -- .../DPX/TESTING/DS_exercisor/makefile | 2 -- .../data_products/DPX/TESTING/TCDS/makefile | 2 -- .../data_products/DPX/TESTING/UDS/makefile | 2 -- trick_source/data_products/DPX/makefile | 2 -- trick_source/data_products/EQParse/makefile | 2 -- trick_source/data_products/Log/makefile | 2 -- trick_source/data_products/Var/makefile | 2 -- trick_source/data_products/units/makefile | 2 -- trick_source/java/makefile | 2 -- trick_source/trick_swig/Makefile | 4 ---- 23 files changed, 65 deletions(-) diff --git a/Makefile b/Makefile index b36c38ac..fd47ff75 100644 --- a/Makefile +++ b/Makefile @@ -148,10 +148,8 @@ MAKE_TRAVERSAL_NEWLINE := | sed '/^make.*: Leaving directory/a\ ' # DEFAULT TARGET # 1 Build Trick-core and Trick Data-products. all: no_dp dp - @ echo -e "\n\e[32m#####################################\e[0m" @ echo -e "\e[32mTrick has been successfully compiled.\e[34m" @date - @ echo -e "\e[32m#####################################\e[0m\n" ifeq ($(USE_JAVA), 1) all: java @@ -166,7 +164,6 @@ no_dp: $(TRICK_LIB) $(TRICK_SWIG_LIB) $(TRICK_LIB): $(SIM_SERV_DIRS) $(UTILS_DIRS) | $(TRICK_LIB_DIR) @ echo -e "\e[34m[---Building $@---]\e[0m" ar crs $@ $(SIM_SERV_OBJS) $(UTILS_OBJS) - @ echo "" ifeq ($(USE_ER7_UTILS), 1) ER7_UTILS_LIB = $(TRICK_LIB_DIR)/liber7_utils.a @@ -175,7 +172,6 @@ no_dp: $(ER7_UTILS_LIB) $(ER7_UTILS_LIB): $(ER7_UTILS_DIRS) | $(TRICK_LIB_DIR) @ echo -e "\e[34m[---Building $@---]\e[0m" ar crs $@ $(ER7_UTILS_OBJS) - @ echo "" endif # 1.1.1.1 Compile the objects in the specified sim_services directories. @@ -183,14 +179,12 @@ endif $(SIM_SERV_DIRS): icg_sim_serv $(TRICK_LIB_DIR) @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ trick - @ echo "" # 1.1.1.2 Compile the objects in the specified utils directories. .PHONY: $(UTILS_DIRS) $(UTILS_DIRS): icg_sim_serv @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ trick - @ echo "" # 1.1.1.3 Compile the objects in the specified er7_utils directories. .PHONY: $(ER7_UTILS_DIRS) @@ -198,7 +192,6 @@ $(ER7_UTILS_DIRS): TRICK_CXXFLAGS += -Wno-unused-parameter $(ER7_UTILS_DIRS): make_er7_makefiles icg_sim_serv @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ trick - @ echo "" .PHONY: make_er7_makefiles make_er7_makefiles: @@ -216,13 +209,11 @@ endif icg_sim_serv: $(ICG_EXE) @ echo -e "\e[34m[---Generating Interface Code---]\e[0m" ${TRICK_HOME}/bin/trick-ICG -s -m ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh - @ echo "" # 1.1.1.4.1 Build the Interface Code Generator (ICG) executable. $(ICG_EXE) : @ echo -e "\e[34m[---Building Interface Code Generator---]\e[0m" $(MAKE) -C trick_source/codegen/Interface_Code_Gen - @ echo "" # 1.1.1.5 Create Trick Library directory. $(TRICK_LIB_DIR): @@ -232,13 +223,11 @@ $(TRICK_LIB_DIR): $(TRICK_SWIG_LIB): $(SWIG_DIRS) | $(TRICK_LIB_DIR) @ echo -e "\e[34m[---Building $@---]\e[0m" ar crs $@ $(SWIG_OBJS) - @ echo "" .PHONY: $(SWIG_DIRS) $(SWIG_DIRS): icg_sim_serv $(TRICK_LIB_DIR) @ echo -e "\e[34m[---Building $@---]\e[0m" @ $(MAKE) -C $@ trick - @ echo "" #------------------------------------------------------------------------------- # 1.2 Build Trick's Data-products Applications. @@ -246,7 +235,6 @@ $(SWIG_DIRS): icg_sim_serv $(TRICK_LIB_DIR) dp: ${TRICK_HOME}/trick_source/trick_utils/units @ echo -e "\e[34m[---Building Data-Products Applications---]\e[0m" @ $(MAKE) -C ${TRICK_HOME}/trick_source/data_products - @ echo "" #------------------------------------------------------------------------------- # 1.3 Build Trick's Java Tools @@ -307,9 +295,7 @@ clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG clean_java @/bin/rm -rf $(TRICK_BIN_DIR) @/bin/rm -rf $(TRICK_LIB_DIR) - @echo -e "\e[32m####################################" @echo -e "\e[32mTrick has been successfully cleaned." - @echo -e "\e[32m####################################\e[0m\n" ifeq ($(USE_ER7_UTILS), 1) diff --git a/share/trick/makefiles/Makefile.tricklib b/share/trick/makefiles/Makefile.tricklib index 14b12434..557df298 100644 --- a/share/trick/makefiles/Makefile.tricklib +++ b/share/trick/makefiles/Makefile.tricklib @@ -169,19 +169,13 @@ depend: @ echo "Created dependency file $(DEPFILE)" io_clean: - @ echo -e "\e[31m\c" $(RM) -rf io_src - @ echo -e "\e[0m\c" clean: - @ echo -e "\e[31m\c" $(RM) -rf $(OBJ_DIR) $(L_C) $(Y_C) $(Y_H) - @ echo -e "\e[0m\c" real_clean: clean io_clean - @ echo -e "\e[31m\c" $(RM) -rf xml *~ *.bak core - @ echo -e "\e[32mDirectory cleaned.\e[0m" help : @ echo -e "\n\ diff --git a/trick_source/codegen/Interface_Code_Gen/makefile b/trick_source/codegen/Interface_Code_Gen/makefile index 5b4c6c0a..dcaf84ec 100644 --- a/trick_source/codegen/Interface_Code_Gen/makefile +++ b/trick_source/codegen/Interface_Code_Gen/makefile @@ -75,6 +75,4 @@ $(OBJ_DIR): mkdir -p $(OBJ_DIR) clean: - @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) $(ICG) - @ echo -e "\e[32mDirectory cleaned.\e[0m" \ No newline at end of file diff --git a/trick_source/data_products/Apps/ExternalPrograms/makefile b/trick_source/data_products/Apps/ExternalPrograms/makefile index 83619baa..a56fabd4 100644 --- a/trick_source/data_products/Apps/ExternalPrograms/makefile +++ b/trick_source/data_products/Apps/ExternalPrograms/makefile @@ -129,8 +129,6 @@ real_clean: fi clean: - @ /bin/echo -e "\e[31m\c" rm -rf object_${TRICK_HOST_CPU} rm -rf ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/*.so - @ /bin/echo -e "\e[32mDirectory cleaned.\e[0m" diff --git a/trick_source/data_products/Apps/Trk2csv/makefile b/trick_source/data_products/Apps/Trk2csv/makefile index cd63ab83..1b7e9e7e 100644 --- a/trick_source/data_products/Apps/Trk2csv/makefile +++ b/trick_source/data_products/Apps/Trk2csv/makefile @@ -29,10 +29,8 @@ $(OBJDIR)/trk2ascii.o: trk2ascii.cpp | $(OBJDIR) $(CC) $(DP_CFLAGS) -c trk2ascii.cpp -o $(OBJDIR)/trk2ascii.o clean: - @ echo -e "\e[31m\c" rm -f trk2ascii rm -rf $(OBJDIR) - @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/makefile b/trick_source/data_products/DPX/APPS/FXPLOT/makefile index ba0ed2b2..d11d2194 100644 --- a/trick_source/data_products/DPX/APPS/FXPLOT/makefile +++ b/trick_source/data_products/DPX/APPS/FXPLOT/makefile @@ -81,9 +81,7 @@ ${LIBDIR}/libDPC.a: $(MAKE) -C ${DPX_DIR}/DPC clean: - @ echo -e "\e[31m\c" ${RM} $(OBJDIR) - @ echo -e "\e[32mDirectory cleaned.\e[0m" spotless: clean diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/makefile b/trick_source/data_products/DPX/APPS/GXPLOT/makefile index bc5fd9b1..76dbe09d 100644 --- a/trick_source/data_products/DPX/APPS/GXPLOT/makefile +++ b/trick_source/data_products/DPX/APPS/GXPLOT/makefile @@ -81,9 +81,7 @@ ${LIBDIR}/libDPV.a: $(MAKE) -C ${DPX_DIR}/DPV/UTILS clean: - @ echo -e "\e[31m\c" ${RM} $(OBJDIR) - @ echo -e "\e[32mDirectory cleaned.\e[0m" spotless: clean diff --git a/trick_source/data_products/DPX/DPC/makefile b/trick_source/data_products/DPX/DPC/makefile index 6e5a0aac..caffc7bb 100644 --- a/trick_source/data_products/DPX/DPC/makefile +++ b/trick_source/data_products/DPX/DPC/makefile @@ -52,10 +52,8 @@ ${LIBDIR}: mkdir -p ${LIBDIR} clean: - @ echo -e "\e[31m\c" ${RM} *~ ${RM} ${OBJDIR} - @ echo -e "\e[32mDirectory cleaned.\e[0m" spotless: clean ${RM} ${LIBDIR}/${LIBNAME} diff --git a/trick_source/data_products/DPX/DPM/makefile b/trick_source/data_products/DPX/DPM/makefile index 7dd96d7b..344dbd7b 100644 --- a/trick_source/data_products/DPX/DPM/makefile +++ b/trick_source/data_products/DPX/DPM/makefile @@ -59,10 +59,8 @@ ${LIBDIR}: mkdir -p ${LIBDIR} clean: - @ echo -e "\e[31m\c" ${RM} *~ ${RM} ${OBJDIR} - @ echo -e "\e[32mDirectory cleaned.\e[0m" spotless: clean ${RM} ${LIBDIR}/${LIBNAME} diff --git a/trick_source/data_products/DPX/DPV/UTILS/makefile b/trick_source/data_products/DPX/DPV/UTILS/makefile index 33db54eb..58ff0734 100644 --- a/trick_source/data_products/DPX/DPV/UTILS/makefile +++ b/trick_source/data_products/DPX/DPV/UTILS/makefile @@ -34,12 +34,9 @@ ${LIBDIR}: mkdir -p ${LIBDIR} clean: - @ echo -e "\e[31m\c" ${RM} *~ ${RM} *.o ${RM} ${OBJDIR} - @ echo -e "\e[0m\c" - @ echo -e "\e[32mDirectory cleaned.\e[0m" spotless: clean ${RM} ${LIBDIR}/${LIBNAME} diff --git a/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile b/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile index d107a54c..31bf4e3f 100644 --- a/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile +++ b/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile @@ -142,13 +142,11 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - @/bin/echo -e "\e[31m\c" ${RM} *~ ${RM} *.o spotless: clean ${RM} ctrl_test - @/bin/echo -e "\e[32mDirectory cleaned.\e[0m" # Dependencies diff --git a/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile b/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile index d6794304..1bae65f0 100644 --- a/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile +++ b/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile @@ -112,13 +112,11 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - @ /bin/echo -e "\e[31m\c" ${RM} *~ ${RM} *.o spotless: clean ${RM} model_test - @ /bin/echo -e "\e[32mDirectory cleaned.\e[0m" # Dependencies diff --git a/trick_source/data_products/DPX/TESTING/DS/makefile b/trick_source/data_products/DPX/TESTING/DS/makefile index f6989da9..399e0aac 100644 --- a/trick_source/data_products/DPX/TESTING/DS/makefile +++ b/trick_source/data_products/DPX/TESTING/DS/makefile @@ -122,13 +122,11 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - @ /bin/echo -e "\e[31m\c" ${RM} *~ ${RM} *.o spotless: clean ${RM} dstest - @ /bin/echo -e "\e[32mDirectory cleaned.\e[0m" # Dependencies diff --git a/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile b/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile index 3c97b838..9c9e9be6 100644 --- a/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile +++ b/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile @@ -100,10 +100,8 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - @ /bin/echo -e "\e[31m\c" ${RM} *~ ${RM} *.o - @ /bin/echo -e "\e[32mDirectory cleaned.\e[0m" spotless: clean diff --git a/trick_source/data_products/DPX/TESTING/TCDS/makefile b/trick_source/data_products/DPX/TESTING/TCDS/makefile index 6cf091d6..72a2957e 100644 --- a/trick_source/data_products/DPX/TESTING/TCDS/makefile +++ b/trick_source/data_products/DPX/TESTING/TCDS/makefile @@ -125,13 +125,11 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - @ /bin/echo -e "\e[31m\c" ${RM} *~ ${RM} *.o spotless: clean ${RM} tcdstest - @ /bin/echo -e "\e[32mDirectory cleaned.\e[0m" # Dependencies diff --git a/trick_source/data_products/DPX/TESTING/UDS/makefile b/trick_source/data_products/DPX/TESTING/UDS/makefile index 5cb194e3..9191e667 100644 --- a/trick_source/data_products/DPX/TESTING/UDS/makefile +++ b/trick_source/data_products/DPX/TESTING/UDS/makefile @@ -125,13 +125,11 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - @ /bin/echo -e "\e[31m\c" ${RM} *~ ${RM} *.o spotless: clean ${RM} udstest - @ /bin/echo -e "\e[32mDirectory cleaned.\e[0m" # Dependencies diff --git a/trick_source/data_products/DPX/makefile b/trick_source/data_products/DPX/makefile index 4df47a2c..ac4182e0 100644 --- a/trick_source/data_products/DPX/makefile +++ b/trick_source/data_products/DPX/makefile @@ -52,12 +52,10 @@ clean: @ $(MAKE) -C TESTING spotless @ $(MAKE) -C APPS spotless - @ echo -e "\e[31m\c" ${RM} DOCS ${RM} ${LIBDIR} ${RM} *~ ${RM} *.o - @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/EQParse/makefile b/trick_source/data_products/EQParse/makefile index e647f96e..ee7c8335 100644 --- a/trick_source/data_products/EQParse/makefile +++ b/trick_source/data_products/EQParse/makefile @@ -93,10 +93,8 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/Log/makefile b/trick_source/data_products/Log/makefile index c1f9b066..104d17fe 100644 --- a/trick_source/data_products/Log/makefile +++ b/trick_source/data_products/Log/makefile @@ -65,10 +65,8 @@ $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) | $(LIBDIR) ar crs $(LIBDIR)/$(LIBNAME) $? clean: - @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/Var/makefile b/trick_source/data_products/Var/makefile index 769cbd28..44eb5a0e 100644 --- a/trick_source/data_products/Var/makefile +++ b/trick_source/data_products/Var/makefile @@ -61,10 +61,8 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/units/makefile b/trick_source/data_products/units/makefile index c16725a8..d97691c6 100644 --- a/trick_source/data_products/units/makefile +++ b/trick_source/data_products/units/makefile @@ -46,10 +46,8 @@ $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) $(C_OBJECTS) $(LIBDIR) ar crs $(LIBDIR)/$(LIBNAME) $(CPP_OBJECTS) $(C_OBJECTS) clean: - @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/java/makefile b/trick_source/java/makefile index dd180f99..5522593f 100644 --- a/trick_source/java/makefile +++ b/trick_source/java/makefile @@ -53,12 +53,10 @@ javadoc: ${DOCS_API_DIR} javadoc -d ${DOCS_API_DIR} -classpath ${CLASS_PATH} -sourcepath ${SRC_DIR} -windowtitle "Trick GUI API" ${JAVA_DOC_LINKS} trick ${SRC_FILES} clean: - @ echo -e "\e[31m\c" rm -rf ${BUILD_DIR} rm -rf ${DIST_DIR} rm -rf ${RESOURCES_DIR} rm -rf ${TEST_REPORTS_DIR} - @ echo -e "\e[32mDirectory cleaned.\e[0m" clean_obj: rm -rf ${BUILD_DIR} diff --git a/trick_source/trick_swig/Makefile b/trick_source/trick_swig/Makefile index 2d74c2df..258a6580 100644 --- a/trick_source/trick_swig/Makefile +++ b/trick_source/trick_swig/Makefile @@ -84,14 +84,10 @@ $(TRICK_LIB) : $(SWIG_OBJECT_FILES) $(OBJECT_FILES) real_clean: clean clean: clean_python - @ echo -e "\e[31m\c" $(RM) -rf $(OBJ_DIR) $(TEST_DIR) $(PY_FILES) - @ echo -e "\e[32mDirectory cleaned.\e[0m" clean_python: - @ echo -e "\e[31m\c" rm -rf swig_${TRICK_HOST_CPU} sim_services.py swig_double.py swig_int.py swig_ref.py - @ echo -e "\e[0m\c" # some depends swig_int_wrap.cpp: swig_int.cpp