From a031b83a09a8628435317a03f199cdc18b78262f Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 1 Nov 2017 11:24:59 -0400 Subject: Initial checkin from CRI-O repo Signed-off-by: Matthew Heon --- conmon/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 conmon/Makefile (limited to 'conmon/Makefile') diff --git a/conmon/Makefile b/conmon/Makefile new file mode 100644 index 000000000..b75605d94 --- /dev/null +++ b/conmon/Makefile @@ -0,0 +1,12 @@ +src = $(wildcard *.c) +obj = $(src:.c=.o) + +override LIBS += $(shell pkg-config --libs glib-2.0) +override CFLAGS += -std=c99 -Os -Wall -Wextra $(shell pkg-config --cflags glib-2.0) + +conmon: $(obj) + $(CC) -o ../bin/$@ $^ $(CFLAGS) $(LIBS) + +.PHONY: clean +clean: + rm -f $(obj) ../bin/conmon -- cgit v1.2.3-54-g00ecf From eab0737f1189a7b88f0a37a6b894ca4345b6853f Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 1 Nov 2017 14:20:05 -0400 Subject: Fix makefile issue Signed-off-by: Matthew Heon --- Makefile | 5 +---- conmon/Makefile | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'conmon/Makefile') diff --git a/Makefile b/Makefile index 39e0a8cda..235ea4a22 100644 --- a/Makefile +++ b/Makefile @@ -62,9 +62,6 @@ ifeq ("$(wildcard $(GOPKGDIR))","") endif touch "$(GOPATH)/.gopathok" -.bindir: - mkdir -p "$(GOPKGDIR)/bin/" - lint: .gopathok @echo "checking lint" @./.tool/lint @@ -117,7 +114,7 @@ testunit: localintegration: clean binaries test-binaries ./test/test_runner.sh ${TESTFLAGS} -binaries: .bindir conmon kpod +binaries: conmon kpod test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/checkseccomp MANPAGES_MD := $(wildcard docs/*.md) diff --git a/conmon/Makefile b/conmon/Makefile index b75605d94..67c067be3 100644 --- a/conmon/Makefile +++ b/conmon/Makefile @@ -5,6 +5,7 @@ override LIBS += $(shell pkg-config --libs glib-2.0) override CFLAGS += -std=c99 -Os -Wall -Wextra $(shell pkg-config --cflags glib-2.0) conmon: $(obj) + mkdir -p ../bin/ $(CC) -o ../bin/$@ $^ $(CFLAGS) $(LIBS) .PHONY: clean -- cgit v1.2.3-54-g00ecf