diff options
author | Aleksandar Bozhinovski <aleksandar.bozhinovski@seavus.com> | 2012-04-12 14:34:03 +0200 |
---|---|---|
committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2012-05-25 14:45:32 +0200 |
commit | d9f6ac4b324136f8d94f240f8cdf4007751fb4c1 (patch) | |
tree | 95ebebd88bb2a14e51e4c30ee6cd0759386e280b /lcmodule/Makefile | |
parent | 91209946caf8680942ea79166bb209f57ca3e69c (diff) |
Auto-generate LcdVersion.cpp and lcm_version.c
LCD/LCM compatibility check was broken by introducing of
mingw cross compiler. The functionality is brought back
by auto-generating LcdVersion.cpp and lcm_version.c
ST-Ericsson ID: 427380
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204
Change-Id: I6c18973d2a38484bdf3003b0edbf3f7b6dd8c34f
Depends-On: I709f594c76bf1d0d0bf88ee205ef94bc772eed10
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/55202
Reviewed-by: QABUILD
Tested-by: Blaze MILADINOV <blaze.miladinov@seavus.com>
Reviewed-by: Viktor MLADENOVSKI <viktor.mladenovski@stericsson.com>
Diffstat (limited to 'lcmodule/Makefile')
-rw-r--r-- | lcmodule/Makefile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lcmodule/Makefile b/lcmodule/Makefile index 2834db2..63424c3 100644 --- a/lcmodule/Makefile +++ b/lcmodule/Makefile @@ -55,7 +55,8 @@ AUTOGEN_FILES := $(AUTO_DIR_LIB)/commands.h\ $(AUTO_DIR_LOADER)/custom_commands.h\ $(AUTO_DIR_LOADER)/custom_command_marshal.c\ $(AUTO_DIR_LOADER)/ces_commands.c\ - $(AUTO_DIR_LOADER)/ces_commands.h + $(AUTO_DIR_LOADER)/ces_commands.h\ + $(LCM_AUTO_DIR)/lcm_version.c LIBSRC :=${TRANSPORT_PATH}/source/bulk_protocol.c\ @@ -75,11 +76,11 @@ LIBSRC :=${TRANSPORT_PATH}/source/bulk_protocol.c\ ${NETWORK_PATH}/source/protrom_header.c\ ${NETWORK_PATH}/source/protrom_network.c\ ${LCM_CNH_PATH}/source/communication_service.c\ - ${LCM_CNH_PATH}/source/lcm_version.c\ ${LCM_CNH_PATH}/source/protrom_family.c\ ${LCM_CNH_PATH}/source/z_family.c\ ${LCM_CNH_PATH}/source/r15_family.c\ ${LCM_CNH_PATH}/source/a2_family.c\ + $(LCM_AUTO_DIR)/lcm_version.c\ ${LCM_PATH}/source/serialization.c ifeq ($(BUILD_WIN),) LIBSRC += ${LCM_PATH}/source/cnh1605551_ldr_utilities/critical_section/critical_section_linux.c @@ -199,6 +200,10 @@ $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR)/%.o: ${LCM_PATH}/source/%.c $(AUTOGEN_FILES) @mkdir -p $(dir $@) $(CC) $(INCLUDES) $(CFLAGS) -c -m32 $< -o $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR)/$(@F) +$(BUILDFOLDER)/$(LIB_x32_OBJ_DIR)/lcm_version.o: $(LCM_AUTO_DIR)/lcm_version.c $(AUTOGEN_FILES) + @mkdir -p $(dir $@) + $(CC) $(INCLUDES) $(CFLAGS) -c -m32 $< -o $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR)/$(@F) + ifeq ($(BUILD_WIN),1) $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR)/%.o: out/autogen/outLCM.rc $(AUTOGEN_FILES) @mkdir -p $(dir $@) @@ -228,6 +233,10 @@ $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR)/%.o: ${LCM_PATH}/source/%.c $(AUTOGEN_FILES) @mkdir -p $(dir $@) $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR)/$(@F) +$(BUILDFOLDER)/$(LIB_x64_OBJ_DIR)/lcm_version.o: $(LCM_AUTO_DIR)/lcm_version.c $(AUTOGEN_FILES) + @mkdir -p $(dir $@) + $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR)/$(@F) + ifeq ($(BUILD_WIN),2) $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR)/%.o: out/autogen/outLCM.rc $(AUTOGEN_FILES) @mkdir -p $(dir $@) @@ -286,6 +295,9 @@ $(AUTO_DIR_LOADER)/custom_commands.h: $(LCM_CUST_CONFIG)/custom_commands.xml $(L $(AUTO_DIR_LOADER)/custom_command_marshal.c: $(LCM_CUST_CONFIG)/custom_commands.xml $(LCM_CUST_CONFIG)/custom_command_marshal.xsl | setup_folders java -classpath $(LCM_PATH)/tools/xalan-j_2_7_1/xalan.jar org.apache.xalan.xslt.Process -in $(LCM_CUST_CONFIG)/custom_commands.xml -xsl $(LCM_CUST_CONFIG)/custom_command_marshal.xsl -out $@ +$(LCM_AUTO_DIR)/lcm_version.c: setup_folders + bash ${LCM_PATH}/../source/gen_version_files.sh --lcm $(abspath $(LCM_AUTO_DIR)) $(abspath $(LCM_PATH)) + #setting up needed folders $(BUILDFOLDER): | configfile @mkdir -p $@ 2> /dev/null |