diff --git a/tools/framework/make/lib.mk b/tools/framework/make/lib.mk index 2dd3a3e..60662be 100644 --- a/tools/framework/make/lib.mk +++ b/tools/framework/make/lib.mk @@ -13,7 +13,7 @@ TAI_LIB_DIR ?= $(TAI_DIR)/tools/lib TAI_META_OUT_DIR ?= $(abspath .) -SRCS ?= $(wildcard *.cpp $(TAI_LIB_DIR)/*.cpp $(TAI_FRAMEWORK_DIR)/*.cpp $(TAI_META_OUT_DIR)/taimetadata.c) +SRCS ?= $(wildcard *.cpp $(TAI_LIB_DIR)/*.cpp $(TAI_FRAMEWORK_DIR)/*.cpp $(TAI_META_OUT_DIR)/*.c) HEADERS ?= $(wildcard *.hpp $(TAI_LIB_DIR)/*.hpp $(TAI_FRAMEWORK_DIR)/*.hpp $(TAI_META_OUT_DIR)/*.h) $(TAI_META_CUSTOM_FILES) OBJS = $(addsuffix .o,$(basename $(SRCS))) @@ -41,10 +41,11 @@ LDFLAGS ?= $(VENDOR_LDFLAGS) -shared -L $(TAI_META_OUT_DIR) -lmetatai -lpthread $(TAI_PROG): meta $(OBJS) $(HEADERS) Makefile $(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) + if [ $(TAI_PROG) != libtai.so ]; then ln -sf $(TAI_PROG) libtai.so; fi meta: $(MAKE) -C $(TAI_DIR)/meta TAI_META_CUSTOM_FILES="$(TAI_META_CUSTOM_FILES)" TAI_META_OUT_DIR=$(TAI_META_OUT_DIR) clean: - $(RM) $(TAI_PROG) $(OBJS) + $(RM) $(TAI_PROG) $(OBJS) libtai.so $(MAKE) -C $(TAI_DIR)/meta clean TAI_META_OUT_DIR=$(TAI_META_OUT_DIR) diff --git a/tools/taish/Makefile b/tools/taish/Makefile index 7236a59..1feb66c 100644 --- a/tools/taish/Makefile +++ b/tools/taish/Makefile @@ -34,6 +34,7 @@ $(TAI_META_DIR)/taimetadata.h $(TAI_META_DIR)/libmetatai.so: $(MAKE) -C $(TAI_META_DIR) libtai.so: Makefile + $(MAKE) -C $(TAI_BASIC_LIB_DIR) clean $(MAKE) -C $(TAI_BASIC_LIB_DIR) ln -sf $(TAI_BASIC_LIB_DIR)/$@ $@