ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-02 23:50:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up 'make' target display further.

Browse Source
This commit is contained in:
Christopher LaChance 2017-12-13 11:04:00 -06:00
parent 5e8cb8649f
commit fbd9d3237f
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -251,6 +251,7 @@ dp: ${TRICK_HOME}/trick_source/trick_utils/units
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# 1.3 Build Trick's Java Tools # 1.3 Build Trick's Java Tools
java: java:
@ echo -e "\e[34m[---Building Java Tools---]\e[0m"
@ $(MAKE) -C ${TRICK_HOME}/trick_source/java @ $(MAKE) -C ${TRICK_HOME}/trick_source/java
.PHONY: javadoc .PHONY: javadoc

1
trick_source/data_products/DPX/APPS/GXPLOT/makefile
View File

@ -55,7 +55,6 @@ OBJECT_FILES = $(C_OBJECT_FILES) $(CXX_OBJECT_FILES)
all: ${TRICK_HOME}/bin/trick-gxplot all: ${TRICK_HOME}/bin/trick-gxplot
${TRICK_HOME}/bin/trick-gxplot: ${LIBDIR}/libDPM.a ${LIBDIR}/libDPC.a ${LIBDIR}/libDPV.a $(OBJECT_FILES) ${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 ${CPP} ${CFLAGS} ${INCDIRS} -o $@ $(OBJECT_FILES) $(ALL_LIBS) ${XLIBS} ${LIBRTDEF} ${CONTROLLER_LIBS} -lDPV
$(C_OBJECT_FILES) : $(OBJDIR)/%.o : %.c $(C_OBJECT_FILES) : $(OBJDIR)/%.o : %.c

2
trick_source/java/makefile
View File

@ -30,7 +30,6 @@ ${DEST_DIR} ${DIST_DIR} ${RESOURCES_DIR} ${DOCS_API_DIR}:
mkdir -p $@ mkdir -p $@
${DIST_DIR}/trick.jar: compile ${DIST_DIR} ${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} . @jar cf ${DIST_DIR}/trick.jar -C ${DEST_DIR} .
@cd ${SRC_DIR} && jar uf ${DIST_DIR}/trick.jar ${RESOURCES} @cd ${SRC_DIR} && jar uf ${DIST_DIR}/trick.jar ${RESOURCES}
@ -38,7 +37,6 @@ external_jars:
@ $(MAKE) -C $(LIB_DIR) @ $(MAKE) -C $(LIB_DIR)
compile: ${DEST_DIR} external_jars 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} @${JAVAC} ${JAVAC_FLAGS} -classpath ${CLASS_PATH} -d ${DEST_DIR} -sourcepath ${SRC_DIR} ${SRC_FILES}
resources: ${RESOURCES_DIR}/trick_icon.png resources: ${RESOURCES_DIR}/trick_icon.png