Skip to content

Commit 24ccdf2

Browse files
taoyuhonglijinxia
authored andcommitted
Tools:acrn-manager: use RELEASE in Makefile
The debug macro -DMNGR_DEBUG is selected by RELEASE value. E.g., run 'make RELEASE=1' at the root of source code. Acked-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
1 parent 4c58356 commit 24ccdf2

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

tools/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ acrnlog:
1111
make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR)
1212

1313
acrn-manager:
14-
make -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR)
14+
make -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
1515

1616
acrntrace:
1717
make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR)

tools/acrn-manager/Makefile

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,39 @@
11

22
OUT_DIR ?= .
33

4+
CFLAGS := -Wall
5+
CFLAGS += -I../../devicemodel/include
6+
ifeq ($(RELEASE),0)
7+
CFLAGS += -g -DMNGR_DEBUG
8+
endif
9+
10+
LDFLAGS := -L$(TOOLS_OUT)
11+
LDFLAGS += -lacrn-mngr
12+
LDFLAGS += -lpthread
13+
414
.PHONY: all
5-
all: $(OUT_DIR)/libacrn-mngr.a $(OUT_DIR)/acrnctl
15+
all: $(OUT_DIR)/libacrn-mngr.a $(OUT_DIR)/acrn_mngr.h $(OUT_DIR)/acrnctl
616

717
$(OUT_DIR)/libacrn-mngr.a: acrn_mngr.c acrn_mngr.h
8-
$(CC) -c acrn_mngr.c -DMNGR_DEBUG -I../../devicemodel/include -Wall -g -o $(OUT_DIR)/acrn_mngr.o
18+
$(CC) $(CFLAGS) -c acrn_mngr.c -o $(OUT_DIR)/acrn_mngr.o
919
ar -cr $@ $(OUT_DIR)/acrn_mngr.o
20+
21+
ifneq ($(OUT_DIR),.)
22+
$(OUT_DIR)/acrn_mngr.h:
1023
cp ./acrn_mngr.h $(OUT_DIR)/
24+
endif
1125

12-
$(OUT_DIR)/acrnctl: acrnctl.c acrn_mngr.h
13-
$(CC) -o $(OUT_DIR)/acrnctl acrnctl.c acrn_vm_ops.c -I../../devicemodel/include -L$(TOOLS_OUT) -lacrn-mngr -lpthread -Wall -g
26+
$(OUT_DIR)/acrnctl: acrnctl.c acrn_mngr.h $(OUT_DIR)/libacrn-mngr.a
27+
$(CC) -o $(OUT_DIR)/acrnctl acrnctl.c acrn_vm_ops.c $(CFLAGS) $(LDFLAGS)
1428

1529
.PHONY: clean
1630
clean:
1731
rm -f $(OUT_DIR)/acrnctl
1832
rm -f $(OUT_DIR)/acrn_mngr.o
1933
rm -f $(OUT_DIR)/libacrn-mngr.a
34+
ifneq ($(OUT_DIR),.)
2035
rm -f $(OUT_DIR)/acrn_mngr.h
36+
endif
2137

2238
.PHONY: install
2339
install: $(OUT_DIR)/acrnctl

0 commit comments

Comments
 (0)