diff --git a/Makefile b/Makefile index b512ed19..95f450e9 100644 --- a/Makefile +++ b/Makefile @@ -287,7 +287,7 @@ clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG clean_java @/bin/rm -rf $(TRICK_LIB_DIR) ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1) -clean: clean_er7_utils +clean: clean_er7_utils endif clean_sim_serv: @@ -311,7 +311,7 @@ clean_swig: done ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1) -clean_swig: make_er7_makefiles +clean_swig: make_er7_makefiles endif clean_ICG : @@ -342,17 +342,6 @@ clean_test: clean_unit_test cd $$i ; /bin/rm -rf io_src object_* swig xml ; \ done -#clean_requirements: -# @ $(MAKE) -C trick_test/requirements_docs clean - -clean_stand_alone_utils: - @ $(MAKE) -C ${TRICK_HOME}/trick_source/trick_utils clean_stand_alone - -clean_stand_alone: clean_stand_alone_utils - -clean_objs_for_rpm: clean_sim_serv clean_er7_utils clean_utils - @ $(MAKE) -C ${TRICK_HOME}/trick_source/java clean_obj - clean_gui: clean_java ################################################################################ @@ -400,12 +389,6 @@ uninstall: ################################################################################ # MISCELLANEOUS DEVELOPER UTILITY TARGETS # ################################################################################ -stand_alone: stand_alone_utils -stand_alone_utils: - @ $(MAKE) -C ${TRICK_HOME}/trick_source/trick_utils stand_alone - -# The below rules are used by Debian based .deb file creating. - # ICG all sim_services files (for testing and debugging ICG). # The -f flag forces io_src files to be regenerated whether or not they need to be. ICG: $(ICG_EXE) diff --git a/trick_source/trick_utils/makefile b/trick_source/trick_utils/makefile deleted file mode 100644 index 2aac316c..00000000 --- a/trick_source/trick_utils/makefile +++ /dev/null @@ -1,73 +0,0 @@ - -# -# This makefile is used to build trick utils standalone. -# That is, without Trick. -# -# It does NOT create lib or object dirs for each platform. -# -# Once ran, all libraries go into "lib" . - -include $(TRICK_HOME)/share/trick/makefiles/Makefile.common - -ifndef TRICK_HOST_CPU -export TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU) -endif - -ifndef TRICK_HOST_TYPE -export TRICK_HOST_TYPE := $(shell gte TRICK_HOST_TYPE) -endif - - -LIB_DIR = lib_${TRICK_HOST_CPU} - -DIRS = comm \ - shm \ - interpolator \ - trick_adt \ - units \ - math # build last becuase of gsl dependency issues - -trick: all - -all: - @ for i in $(DIRS) ; do \ - echo ; echo "==: Compile trick_utils/$$i" ; \ - echo -n "==Start "; date "+%H:%M:%S" ;\ - cd $$i ; \ - $(MAKE) trick ; \ - if [ $$? -ne 0 ] ; then \ - exit 1 ; \ - fi ; \ - cd .. ; \ - echo -n "==Stop "; date "+%H:%M:%S" ;\ - done - @ if [ "$(STAND_ALONE)" = "1" ] ; then \ - echo "== Trick utils (stand alone) make complete ==" ; \ - else \ - echo "== Trick utils make complete ==" ; \ - fi - -$(LIB_DIR): - @ mkdir -p $(LIB_DIR) - @ echo "$(LIB_DIR) created" - -stand_alone: - @ $(MAKE) STAND_ALONE=1 all - -clean_stand_alone: - @ $(MAKE) STAND_ALONE=1 clean - -real_clean: clean clean_stand_alone - -clean: - @ /bin/rm -rf $(LIB_DIR) - @ for i in $(DIRS) ; do \ - $(MAKE) -C $$i real_clean ; \ - done - @ echo " " - @ if [ "$(STAND_ALONE)" = "1" ] ; then \ - echo "Cleaned all of trick_utils (stand alone) !!!" ; \ - else \ - echo "Cleaned all of trick_utils !!!" ; \ - fi - @ echo " "