diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-16 17:33:56 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-27 06:48:20 +0000 |
| commit | 3aa63b2b941aac40c5e3639b0880922b842052ab (patch) | |
| tree | 83bc6337500b3f5ef0f94a0f94f87f6a3549f01b /conmon/Makefile | |
| parent | fb58b873981d2fd0d4f97036afab2aa2ce9e1633 (diff) | |
| download | podman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.gz podman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.bz2 podman-3aa63b2b941aac40c5e3639b0880922b842052ab.zip | |
Remove conmon, get package from CRI-O
conmon should not be built in two different places.
conmon is now a separate package in Fedora so we can just
add requires, for use on Ubuntu we can just require cri-o to
be installed.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #151
Approved by: mheon
Diffstat (limited to 'conmon/Makefile')
| -rw-r--r-- | conmon/Makefile | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/conmon/Makefile b/conmon/Makefile deleted file mode 100644 index 67c067be3..000000000 --- a/conmon/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -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) - mkdir -p ../bin/ - $(CC) -o ../bin/$@ $^ $(CFLAGS) $(LIBS) - -.PHONY: clean -clean: - rm -f $(obj) ../bin/conmon |