diff options
| author | Kalle Vahlman <kalle.vahlman@movial.com> | 2012-06-18 10:15:52 +0300 |
|---|---|---|
| committer | Kalle Vahlman <kalle.vahlman@movial.com> | 2012-06-18 10:15:52 +0300 |
| commit | b0bde663e7360aa8751e98929918effc50c0f50e (patch) | |
| tree | ba2ae00167e244552086643b31ebeb6867aa3b6d | |
| parent | e879ed8ad30ab26a9e55d1422d5820f8b889b6fd (diff) | |
Fix Xalan setup for lcmodule
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | lcmodule/Makefile | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -512,7 +512,7 @@ astyle: .PHONY: lcmodule-config lcmodule-config: - make -C lcmodule config BUILDFOLDER=$(BUILDFOLDER) LCMLIB_INSTALLDIR=$(LCD_INSTALLDIR) LCMLDR_INSTALLDIR=$(LCD_INSTALLDIR) + make -C lcmodule config BUILDFOLDER=$(BUILDFOLDER) LCMLIB_INSTALLDIR=$(LCD_INSTALLDIR) LCMLDR_INSTALLDIR=$(LCD_INSTALLDIR) XALAN=$(XALAN) .PHONY: lcmodule lcmodule: diff --git a/lcmodule/Makefile b/lcmodule/Makefile index 1471790..896cfe9 100644 --- a/lcmodule/Makefile +++ b/lcmodule/Makefile @@ -243,7 +243,6 @@ $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR)/%.o: $(LCM_AUTO_DIR)/outLCM.rc $(AUTOGEN_FILES endif #Autogen files -XALAN := $(LCM_PATH)/tools/xalan-j_2_7_1/xalan.jar $(AUTO_DIR_LIB)/commands.h: $(LCM_CONFIG)/commands.xml $(LCM_CONFIG)/commands_h.xsl | setup_folders java -classpath $(XALAN) org.apache.xalan.xslt.Process -in $(LCM_CONFIG)/commands.xml -xsl $(LCM_CONFIG)/commands_h.xsl -out $@ -PARAM target lcm @@ -372,6 +371,7 @@ configfile: $(if $(wildcard $(config_file)),,config) config: LIB_x32_OBJ_DIR := x32 config: LIB_x64_OBJ_DIR := x64 config: LOADER_DIR := ./ +config: XALAN := $(LCM_PATH)/tools/xalan-j_2_7_1/xalan.jar config: ifeq ($(CONFIG_DIR),) BUILDOUT := $(LCM_PATH)/out @@ -417,6 +417,7 @@ config: @echo "LCMLIB_INSTALLDIR := $(LCMLIB_INSTALLDIR)" >> $(config_file) @echo "LIB_x32_OBJ_DIR := $(LIB_x32_OBJ_DIR)" >> $(config_file) @echo "LIB_x64_OBJ_DIR := $(LIB_x64_OBJ_DIR)" >> $(config_file) + @echo "XALAN := $(XALAN)" >> $(config_file) @echo CONFIG_DIR : $(CONFIG_DIR) install: |