From e879ed8ad30ab26a9e55d1422d5820f8b889b6fd Mon Sep 17 00:00:00 2001 From: Kalle Vahlman Date: Mon, 29 Aug 2011 14:31:51 +0300 Subject: Add build target for lcmodule and its config --- Makefile | 13 +++++++++++-- 1 file 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 -- cgit v1.2.3