mirror of
https://github.com/nasa/trick.git
synced 2024-12-18 20:57:55 +00:00
Updated formating and replaced formating variables.
This commit is contained in:
Christopher LaChance
parent
1bb3ac2a06
commit
6e0fcbd947
15
Makefile
15
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
|
||||
|
||||
@ -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 ${<F} -o $(UP_DIR)$@
|
||||
|
||||
|
||||
#############################################
|
||||
# FORMATTING VARIABLES
|
||||
#############################################
|
||||
REMOVAL_COLOR := @ echo -e "\e[31m\c"
|
||||
DEFAULT_COLOR := @ echo -e "\e[0m\c"
|
||||
|
||||
#
|
||||
# OTHER RULES
|
||||
#
|
||||
|
||||
depend:
|
||||
@ $(TRICK_CPPC) -MM $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(C_SRC) $(CPP_SRC) >> $(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"
|
||||
|
||||
|
||||
@ -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}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user