diff options
Diffstat (limited to 'decoder/build/linux')
| -rw-r--r-- | decoder/build/linux/makefile | 23 | ||||
| -rw-r--r-- | decoder/build/linux/makefile.dev | 3 | ||||
| -rw-r--r-- | decoder/build/linux/rctdl_c_api_lib/makefile | 2 | ||||
| -rw-r--r-- | decoder/build/linux/ref_trace_decode_lib/makefile | 4 |
4 files changed, 26 insertions, 6 deletions
diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile index 659cf68c6376..5515737f0d00 100644 --- a/decoder/build/linux/makefile +++ b/decoder/build/linux/makefile @@ -65,9 +65,10 @@ export INSTALL=install # installation directory PREFIX ?=/usr LIB_PATH ?= lib -INSTALL_LIB_DIR=$(PREFIX)/$(LIB_PATH) -INSTALL_BIN_DIR=$(PREFIX)/bin -export INSTALL_INCLUDE_DIR=$(PREFIX)/include/ +INSTALL_LIB_DIR=$(DESTDIR)$(PREFIX)/$(LIB_PATH) +INSTALL_BIN_DIR=$(DESTDIR)$(PREFIX)/bin +export INSTALL_INCLUDE_DIR=$(DESTDIR)$(PREFIX)/include/ +INSTALL_MAN_DIR=$(DESTDIR)$(PREFIX)/share/man/man1 # compile flags CFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -Wlogical-op -fPIC @@ -114,19 +115,27 @@ all: libs tests libs: $(LIB_BASE_NAME)_lib $(LIB_CAPI_NAME)_lib +DEF_SO_PERM ?= 644 + install: libs tests mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_BIN_DIR) cp -d $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so $(INSTALL_LIB_DIR)/ cp -d $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so.$(SO_MAJOR_VER) $(INSTALL_LIB_DIR)/ - $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so.$(SO_VER) $(INSTALL_LIB_DIR)/ + $(INSTALL) --mode=$(DEF_SO_PERM) $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so.$(SO_VER) $(INSTALL_LIB_DIR)/ cp -d $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so $(INSTALL_LIB_DIR)/ cp -d $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so.$(SO_MAJOR_VER) $(INSTALL_LIB_DIR)/ - $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so.$(SO_VER) $(INSTALL_LIB_DIR)/ + $(INSTALL) --mode=$(DEF_SO_PERM) $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so.$(SO_VER) $(INSTALL_LIB_DIR)/ +ifndef DISABLE_STATIC $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).a $(INSTALL_LIB_DIR)/ $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).a $(INSTALL_LIB_DIR)/ +endif cd $(OCSD_ROOT)/build/linux/rctdl_c_api_lib && make install_inc $(INSTALL) --mode=755 $(BIN_TEST_TARGET_DIR)/trc_pkt_lister $(INSTALL_BIN_DIR)/ +install_man: + mkdir -p $(INSTALL_MAN_DIR) + $(INSTALL) --mode=644 $(OCSD_ROOT)/docs/man/trc_pkt_lister.1 $(INSTALL_MAN_DIR)/ + ################################ # build OpenCSD trace decode library @@ -164,6 +173,7 @@ tests: libs cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && $(MAKE) cd $(OCSD_ROOT)/tests/build/linux/c_api_pkt_print_test && $(MAKE) cd $(OCSD_ROOT)/tests/build/linux/mem_buffer_eg && $(MAKE) + cd $(OCSD_ROOT)/tests/build/linux/frame_demux_test && $(MAKE) # # build docs @@ -189,6 +199,7 @@ clean_tests: cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && $(MAKE) clean cd $(OCSD_ROOT)/tests/build/linux/c_api_pkt_print_test && $(MAKE) clean cd $(OCSD_ROOT)/tests/build/linux/mem_buffer_eg && $(MAKE) clean + cd $(OCSD_ROOT)/tests/build/linux/frame_demux_test && $(MAKE) clean -rmdir $(OCSD_TESTS)/lib clean_docs: @@ -198,3 +209,5 @@ clean_install: -rm $(INSTALL_LIB_DIR)/lib$(LIB_BASE_NAME).* -rm $(INSTALL_LIB_DIR)/lib$(LIB_CAPI_NAME).* -rm -r $(INSTALL_INCLUDE_DIR)/$(LIB_UAPI_INC_DIR) + -rm $(INSTALL_BIN_DIR)/trc_pkt_lister + -rm $(INSTALL_MAN_DIR)/trc_pkt_lister.1 diff --git a/decoder/build/linux/makefile.dev b/decoder/build/linux/makefile.dev index 5eb1ec9557fa..aaaa983845cf 100644 --- a/decoder/build/linux/makefile.dev +++ b/decoder/build/linux/makefile.dev @@ -63,5 +63,8 @@ else PLAT_DIR=linux$(BIT_VARIANT)/$(BUILD_VARIANT) endif +# for dev env, enable static link build test +export TEST_STATIC_LINKING=1 + # include the main makefile include makefile diff --git a/decoder/build/linux/rctdl_c_api_lib/makefile b/decoder/build/linux/rctdl_c_api_lib/makefile index a0bd5a345f2f..7b4055dd7f6b 100644 --- a/decoder/build/linux/rctdl_c_api_lib/makefile +++ b/decoder/build/linux/rctdl_c_api_lib/makefile @@ -113,6 +113,8 @@ install_inc: $(INSTALL) --mode=0644 $(INST_INC_SRC)/etmv3/trc_pkt_types_etmv3.h $(INST_INC_DST)/etmv3/ $(INSTALL) -d --mode=0755 $(INST_INC_DST)/etmv4 $(INSTALL) --mode=0644 $(INST_INC_SRC)/etmv4/trc_pkt_types_etmv4.h $(INST_INC_DST)/etmv4/ + $(INSTALL) -d --mode=0755 $(INST_INC_DST)/ete + $(INSTALL) --mode=0644 $(INST_INC_SRC)/ete/trc_pkt_types_ete.h $(INST_INC_DST)/ete/ $(INSTALL) -d --mode=0755 $(INST_INC_DST)/c_api $(INSTALL) --mode=0644 $(INST_INC_SRC)/c_api/ocsd_c_api_types.h $(INST_INC_DST)/c_api/ $(INSTALL) --mode=0644 $(INST_INC_SRC)/c_api/opencsd_c_api.h $(INST_INC_DST)/c_api/ diff --git a/decoder/build/linux/ref_trace_decode_lib/makefile b/decoder/build/linux/ref_trace_decode_lib/makefile index 7087036cc62e..58d5c6ecbfce 100644 --- a/decoder/build/linux/ref_trace_decode_lib/makefile +++ b/decoder/build/linux/ref_trace_decode_lib/makefile @@ -41,6 +41,7 @@ BUILD_DIR=./$(PLAT_DIR) VPATH= $(OCSD_SOURCE) \ $(OCSD_SOURCE)/etmv3 \ $(OCSD_SOURCE)/etmv4 \ + $(OCSD_SOURCE)/ete \ $(OCSD_SOURCE)/ptm \ $(OCSD_SOURCE)/i_dec \ $(OCSD_SOURCE)/mem_acc \ @@ -59,10 +60,11 @@ ETMV3OBJ= $(BUILD_DIR)/trc_cmp_cfg_etmv3.o \ $(BUILD_DIR)/trc_pkt_proc_etmv3_impl.o ETMV4OBJ= $(BUILD_DIR)/trc_cmp_cfg_etmv4.o \ + $(BUILD_DIR)/trc_etmv4_stack_elem.o \ $(BUILD_DIR)/trc_pkt_proc_etmv4i.o \ $(BUILD_DIR)/trc_pkt_decode_etmv4i.o \ $(BUILD_DIR)/trc_pkt_elem_etmv4i.o \ - $(BUILD_DIR)/trc_etmv4_stack_elem.o + $(BUILD_DIR)/trc_cmp_cfg_ete.o PTMOBJ= $(BUILD_DIR)/trc_cmp_cfg_ptm.o \ $(BUILD_DIR)/trc_pkt_elem_ptm.o \ |