diff --git a/pkg/docker/Dockerfile.alpine b/pkg/docker/Dockerfile.alpine index c50c1980..87320cc9 100644 --- a/pkg/docker/Dockerfile.alpine +++ b/pkg/docker/Dockerfile.alpine @@ -7,6 +7,8 @@ RUN apk add --no-cache \ libbsd-dev \ libgpiod-dev +RUN ls -l /usr/lib/ + WORKDIR /build/ustreamer/ COPY . . RUN make -j5 WITH_GPIO=1 diff --git a/src/Makefile b/src/Makefile index 112259c5..c3aea80f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -11,11 +11,16 @@ _USTR = ustreamer.bin _DUMP = ustreamer-dump.bin _V4P = ustreamer-v4p.bin -_CFLAGS = -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(CFLAGS) - -_USTR_LDFLAGS = -static $(LDFLAGS) -lm -ljpeg -pthread -lrt -latomic -levent -levent_pthreads -_DUMP_LDFLAGS = -static $(LDFLAGS) -lm -ljpeg -pthread -lrt -latomic -_V4P_LDFLAGS = -static $(LDFLAGS) -lm -ljpeg -pthread -lrt -latomic +_CFLAGS = -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(CFLAGS) \ + $(shell pkg-config --cflags libjpeg) \ + $(shell pkg-config --cflags libevent) + +_COMMON_LIBS = -static $(shell pkg-config --libs libjpeg) -lm -pthread -lrt -latomic +_USTR_LDFLAGS = $(LDFLAGS) $(_COMMON_LIBS) \ + $(shell pkg-config --libs libevent) \ + $(shell pkg-config --libs libevent_pthreads) +_DUMP_LDFLAGS = $(LDFLAGS) $(_COMMON_LIBS) +_V4P_LDFLAGS = $(LDFLAGS) $(_COMMON_LIBS) _USTR_SRCS = $(shell ls \ libs/*.c \