forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-05-26 15:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow overriding pkg-config (#301)

Browse Source
This commit is contained in:
Jack Wilsdon
2025-01-27 00:53:39 +00:00
committed by GitHub
parent ddec4e8478
commit b304364af9
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -6,6 +6,7 @@ MANPREFIX ?= $(PREFIX)/share/man
CC ?= gcc CC ?= gcc
PY ?= python3 PY ?= python3
PKG_CONFIG ?= pkg-config
CFLAGS ?= -O3 CFLAGS ?= -O3
LDFLAGS ?= LDFLAGS ?=
@@ -17,8 +18,8 @@ _LINTERS_IMAGE ?= ustreamer-linters
# ===== # =====
ifeq (__not_found__,$(shell which pkg-config 2>/dev/null || echo "__not_found__")) ifeq (__not_found__,$(shell which $(PKG_CONFIG) 2>/dev/null || echo "__not_found__"))
$(error "No pkg-config found in $(PATH)") $(error "No $(PKG_CONFIG) found in $(PATH)")
endif endif

5
janus/Makefile
View File

@@ -2,6 +2,7 @@ R_DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
CC ?= gcc CC ?= gcc
PKG_CONFIG ?= pkg-config
CFLAGS ?= -O3 CFLAGS ?= -O3
LDFLAGS ?= LDFLAGS ?=
@@ -9,8 +10,8 @@ LDFLAGS ?=
# ===== # =====
_PLUGIN = libjanus_ustreamer.so _PLUGIN = libjanus_ustreamer.so
_CFLAGS = -fPIC -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(shell pkg-config --cflags glib-2.0) $(CFLAGS) _CFLAGS = -fPIC -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(shell $(PKG_CONFIG) --cflags glib-2.0) $(CFLAGS)
_LDFLAGS = -shared -lm -pthread -lrt -ljansson -lopus -lasound -lspeexdsp $(shell pkg-config --libs glib-2.0) $(LDFLAGS) _LDFLAGS = -shared -lm -pthread -lrt -ljansson -lopus -lasound -lspeexdsp $(shell $(PKG_CONFIG) --libs glib-2.0) $(LDFLAGS)
_SRCS = $(shell ls src/uslibs/*.c src/*.c) _SRCS = $(shell ls src/uslibs/*.c src/*.c)

9
src/Makefile
View File

@@ -2,6 +2,7 @@ R_DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
CC ?= gcc CC ?= gcc
PKG_CONFIG ?= pkg-config
CFLAGS ?= -O3 CFLAGS ?= -O3
LDFLAGS ?= LDFLAGS ?=
@@ -51,7 +52,7 @@ endef
ifneq ($(call optbool,$(WITH_GPIO)),) ifneq ($(call optbool,$(WITH_GPIO)),)
override _CFLAGS += -DWITH_GPIO $(shell pkg-config --atleast-version=2 libgpiod 2> /dev/null && echo -DHAVE_GPIOD2) override _CFLAGS += -DWITH_GPIO $(shell $(PKG_CONFIG) --atleast-version=2 libgpiod 2> /dev/null && echo -DHAVE_GPIOD2)
override _USTR_LDFLAGS += -lgpiod override _USTR_LDFLAGS += -lgpiod
override _USTR_SRCS += $(shell ls ustreamer/gpio/*.c) override _USTR_SRCS += $(shell ls ustreamer/gpio/*.c)
endif endif
@@ -83,10 +84,10 @@ WITH_V4P ?= 0
ifneq ($(call optbool,$(WITH_V4P)),) ifneq ($(call optbool,$(WITH_V4P)),)
override _TARGETS += $(_V4P) override _TARGETS += $(_V4P)
override _OBJS += $(_V4P_SRCS:%.c=$(_BUILD)/%.o) override _OBJS += $(_V4P_SRCS:%.c=$(_BUILD)/%.o)
override _CFLAGS += -DWITH_V4P $(shell pkg-config --cflags libdrm) override _CFLAGS += -DWITH_V4P $(shell $(PKG_CONFIG) --cflags libdrm)
override _V4P_LDFLAGS += $(shell pkg-config --libs libdrm) override _V4P_LDFLAGS += $(shell $(PKG_CONFIG) --libs libdrm)
override _USTR_SRCS += $(shell ls libs/drm/*.c) override _USTR_SRCS += $(shell ls libs/drm/*.c)
override _USTR_LDFLAGS += $(shell pkg-config --libs libdrm) override _USTR_LDFLAGS += $(shell $(PKG_CONFIG) --libs libdrm)
endif endif