summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Vahlman <kalle.vahlman@movial.com>2011-08-29 14:31:51 +0300
committerKalle Vahlman <kalle.vahlman@movial.com>2012-06-18 09:44:34 +0300
commite879ed8ad30ab26a9e55d1422d5820f8b889b6fd (patch)
tree897da115e1858119977f3d51cf73ecdd7e7eb971
parentc3a0c2f1ad2c48afa1e36197364fc9d4c0753478 (diff)
Add build target for lcmodule and its config
-rw-r--r--Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 643fe9f..e79e7a8 100644
--- a/Makefile
+++ b/Makefile
@@ -161,13 +161,13 @@ ifeq ($(LBITS),64)
# do 64 bit stuff here, like set some CFLAGS
#
CXXFLAGS += -DLINUX_64
-start-build: configfile setup_folders $(LIB_x32) $(LIB_x64)
+start-build: configfile setup_folders $(LIB_x32) $(LIB_x64) lcmodule
else
#
# do 32 bit stuff here
#
CXXFLAGS += -DLINUX_32
-start-build: configfile setup_folders $(LIB_x32)
+start-build: configfile setup_folders $(LIB_x32) lcmodule
endif
else
@@ -384,6 +384,7 @@ ifeq ($(CONFIG_DIR),)
else
BUILDOUT := $(CONFIG_DIR)/out
endif
+config: lcmodule-config
config:
@echo Generating config file...
@rm -f $(config_file)
@@ -508,3 +509,11 @@ astyle:
astyle --style=k/r --indent=spaces --break-blocks --convert-tabs --add-brackets \
--unpad-paren --pad-header --pad-oper --indent-col1-comments --align-pointer=name \
-R "*.h" -R "*.c" -R "*.cpp"
+
+.PHONY: lcmodule-config
+lcmodule-config:
+ make -C lcmodule config BUILDFOLDER=$(BUILDFOLDER) LCMLIB_INSTALLDIR=$(LCD_INSTALLDIR) LCMLDR_INSTALLDIR=$(LCD_INSTALLDIR)
+
+.PHONY: lcmodule
+lcmodule:
+ make -C lcmodule