vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove json-glib in the remaining places

Browse source 
Signed-off-by: Alexander Larsson <alexl@redhat.com>
This commit is contained in:
Alexander Larsson 2017-06-02 16:18:27 +02:00 • committed by Antonio Murdaca
parent e7bb37c001
commit 85aea09215
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -19,7 +19,6 @@ RUN apt-get update && apt-get install -y \
protobuf-compiler \ protobuf-compiler \
python-minimal \ python-minimal \
libglib2.0-dev \ libglib2.0-dev \
libjson-glib-dev \
libapparmor-dev \ libapparmor-dev \
btrfs-tools \ btrfs-tools \
libdevmapper1.02.1 \ libdevmapper1.02.1 \

2
conmon/Makefile
View file

@ -1,7 +1,7 @@
src = $(wildcard *.c) src = $(wildcard *.c)
obj = $(src:.c=.o) obj = $(src:.c=.o)
override LIBS += $(shell pkg-config --libs glib-2.0 json-glib-1.0) override LIBS += $(shell pkg-config --libs glib-2.0)
override CFLAGS += -std=c99 -Os -Wall -Wextra $(shell pkg-config --cflags glib-2.0) override CFLAGS += -std=c99 -Os -Wall -Wextra $(shell pkg-config --cflags glib-2.0)
conmon: $(obj) conmon: $(obj)