Skip to content

Commit b43f5cb

Browse files
lyan3Eddie Dong
authored andcommitted
tools: do not include unnecessary files in release build
This commit removes the unnecessary tool files in release build, including: - entire acrnlog module - entire acrntrace module - acrnctl binary in acrn-manager Tracked-On: #2575 Signed-off-by: Yan, Like <like.yan@intel.com> Reviewed-by: Huang, Yonghua <yonghua.huang@intel.com> Acked-by: Yin Fengwei <fengwei.yin@intel.com>
1 parent eee7d8e commit b43f5cb

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

tools/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
T := $(CURDIR)
22
OUT_DIR ?= $(shell mkdir -p $(T)/build;cd $(T)/build;pwd)
3+
RELEASE ?= 0
34

45
.PHONY: all acrn-crashlog acrnlog acrn-manager acrntrace acrnbridge
56
ifeq ($(RELEASE),0)
67
all: acrn-crashlog acrnlog acrn-manager acrntrace acrnbridge
78
else
8-
all: acrnlog acrn-manager acrntrace acrnbridge
9+
all: acrn-manager acrnbridge
910
endif
1011

1112
acrn-crashlog:
@@ -35,7 +36,7 @@ clean:
3536
ifeq ($(RELEASE),0)
3637
install: acrn-crashlog-install acrnlog-install acrn-manager-install acrntrace-install acrnbridge-install
3738
else
38-
install: acrnlog-install acrn-manager-install acrntrace-install acrnbridge-install
39+
install: acrn-manager-install acrnbridge-install
3940
endif
4041

4142
acrn-crashlog-install:

tools/acrn-manager/Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
T := $(CURDIR)
22
OUT_DIR ?= $(shell mkdir -p $(T)/build;cd $(T)/build;pwd)
33
CC ?= gcc
4+
RELEASE ?= 0
45

56
MANAGER_CFLAGS := -g -O0 -std=gnu11
67
MANAGER_CFLAGS += -D_GNU_SOURCE
@@ -50,7 +51,11 @@ MANAGER_LDFLAGS += -lacrn-mngr
5051
MANAGER_LDFLAGS += $(LDFLAGS)
5152

5253
.PHONY: all
54+
ifeq ($(RELEASE),0)
5355
all: $(OUT_DIR)/libacrn-mngr.a $(OUT_DIR)/acrn_mngr.h $(OUT_DIR)/acrnctl $(OUT_DIR)/acrnd
56+
else
57+
all: $(OUT_DIR)/libacrn-mngr.a $(OUT_DIR)/acrn_mngr.h $(OUT_DIR)/acrnd
58+
endif
5459

5560
$(OUT_DIR)/libacrn-mngr.a: acrn_mngr.c acrn_mngr.h
5661
$(CC) $(MANAGER_CFLAGS) -c acrn_mngr.c -o $(OUT_DIR)/acrn_mngr.o
@@ -83,12 +88,14 @@ ifneq ($(OUT_DIR),.)
8388
endif
8489

8590
.PHONY: install
86-
install: $(OUT_DIR)/acrnctl $(OUT_DIR)/acrn_mngr.h $(OUT_DIR)/libacrn-mngr.a
91+
install:
8792
install -d $(DESTDIR)/usr/bin
8893
install -d $(DESTDIR)/usr/lib/systemd/system
8994
install -d $(DESTDIR)/usr/lib64/
9095
install -d $(DESTDIR)/usr/include/acrn
96+
ifeq ($(RELEASE),0)
9197
install -t $(DESTDIR)/usr/bin $(OUT_DIR)/acrnctl
98+
endif
9299
install -t $(DESTDIR)/usr/bin $(OUT_DIR)/acrnd
93100
install -t $(DESTDIR)/usr/lib64/ $(OUT_DIR)/libacrn-mngr.a
94101
install -t $(DESTDIR)/usr/include/acrn $(OUT_DIR)/acrn_mngr.h

0 commit comments

Comments
 (0)