Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add 'CAN-binder/libs/openxc-message-format/' from commit 'd9f54f97578429773421abce98d...
[apps/agl-service-can-low-level.git]
/
CAN-binder
/
AGLBuild.mk
diff --git
a/CAN-binder/AGLBuild.mk
b/CAN-binder/AGLBuild.mk
index
1adb0e4
..
ccbc28b
100755
(executable)
--- a/
CAN-binder/AGLBuild.mk
+++ b/
CAN-binder/AGLBuild.mk
@@
-16,8
+16,6
@@
BUILD_DIR := build
PACKAGING_DIR := packaging/wgt
BUILD_DIR := build
PACKAGING_DIR := packaging/wgt
-PACKAGING_FILE := $(PACKAGING_DIR)/package.in
-PKG_FILELIST := $(shell cat $(PACKAGING_FILE))
VPATH = etc:$(PACKAGING_DIR):$(PACKAGING_DIR)/etc:$(BUILD_DIR)
VPATH = etc:$(PACKAGING_DIR):$(PACKAGING_DIR)/etc:$(BUILD_DIR)
@@
-32,13
+30,12
@@
mrproper:
rm -rf ${BUILD_DIR}
build: ${BUILD_DIR}/Makefile
rm -rf ${BUILD_DIR}
build: ${BUILD_DIR}/Makefile
- cmake --build ${BUILD_DIR} --
clean-first
+ cmake --build ${BUILD_DIR} --
target all
-package: config.xml
icon.png
| $(PKG_FILELIST)
+package: config.xml
.in icon.png.in build
| $(PKG_FILELIST)
mkdir -p ${BUILD_DIR}/$@/{bin,etc,lib,htdocs,data}
mkdir -p ${BUILD_DIR}/$@/{bin,etc,lib,htdocs,data}
- cp -r $(filter %.so, $|) ${BUILD_DIR}/$@/lib
- cp -r $(filter %.cfg %.conf %.cnf %.ini, $|) ${BUILD_DIR}/$@/etc
+ cmake --build ${BUILD_DIR} --target widget
${BUILD_DIR}/Makefile:
@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
${BUILD_DIR}/Makefile:
@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
- @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CMAKE_OPTS} ..)
+ @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CMAKE_OPTS} ..)
\ No newline at end of file