diff options
| author | Alex Colomar <alx.manpages@gmail.com> | 2022-09-13 15:42:42 +0200 |
|---|---|---|
| committer | Alex Colomar <alx.manpages@gmail.com> | 2022-09-13 16:47:25 +0200 |
| commit | 7c385f93fcf467885bd585e39dd3de990eb77dc0 (patch) | |
| tree | e1b59850625a5e9b639418a319ed9ee2bf861c90 | |
| parent | 4d9ecbbc827d8c3aa2b3b447a3bbb3f3c65ae4f9 (diff) | |
build-src.mk, cmd.mk: Add libbsd to the build of example programs
Some programs need libbsd for using errc(3).
Signed-off-by: Alex Colomar <alx.manpages@gmail.com>
| -rw-r--r-- | lib/build-src.mk | 11 | ||||
| -rw-r--r-- | lib/cmd.mk | 25 |
2 files changed, 22 insertions, 14 deletions
diff --git a/lib/build-src.mk b/lib/build-src.mk index ab3c741d9..7c942a81e 100644 --- a/lib/build-src.mk +++ b/lib/build-src.mk @@ -14,11 +14,15 @@ include $(srcdir)/lib/lint.mk include $(srcdir)/lib/src.mk -DEFAULT_CPPFLAGS := +PKG-CONFIG_LIBS := libbsd-overlay + + +DEFAULT_CPPFLAGS := $(shell $(PKG-CONFIG) --cflags-only-I $(PKG-CONFIG_LIBS)) EXTRA_CPPFLAGS := CPPFLAGS := $(DEFAULT_CPPFLAGS) $(EXTRA_CPPFLAGS) -DEFAULT_CFLAGS := -std=gnu17 +DEFAULT_CFLAGS := $(shell $(PKG-CONFIG) --cflags-only-other $(PKG-CONFIG_LIBS)) +DEFAULT_CFLAGS += -std=gnu17 DEFAULT_CFLAGS += -Wall DEFAULT_CFLAGS += -Wextra DEFAULT_CFLAGS += -Wstrict-prototypes @@ -34,10 +38,13 @@ DEFAULT_LDFLAGS := -Wl,--as-needed DEFAULT_LDFLAGS += -Wl,--no-allow-shlib-undefined DEFAULT_LDFLAGS += -Wl,--no-copy-dt-needed-entries DEFAULT_LDFLAGS += -Wl,--no-undefined +DEFAULT_LDFLAGS += $(shell $(PKG-CONFIG) --libs-only-L $(PKG-CONFIG_LIBS)) +DEFAULT_LDFLAGS += $(shell $(PKG-CONFIG) --libs-only-other $(PKG-CONFIG_LIBS)) EXTRA_LDFLAGS := LDFLAGS := $(DEFAULT_LDFLAGS) $(EXTRA_LDFLAGS) DEFAULT_LDLIBS := -lc +DEFAULT_LDLIBS += $(shell $(PKG-CONFIG) --libs-only-l $(PKG-CONFIG_LIBS)) EXTRA_LDLIBS := LDLIBS := $(DEFAULT_LDLIBS) $(EXTRA_LDLIBS) diff --git a/lib/cmd.mk b/lib/cmd.mk index 2704cb3d0..643e4dbd8 100644 --- a/lib/cmd.mk +++ b/lib/cmd.mk @@ -8,18 +8,19 @@ ifndef MAKEFILE_CMD_INCLUDED MAKEFILE_CMD_INCLUDED := 1 -BC := bc -ECHO := echo -FIND := find -GIT := git -GREP := grep -GZIP := gzip -SED := sed -SORT := sort -TAC := tac -TAR := tar -XARGS := xargs -XZ := xz +BC := bc +ECHO := echo +FIND := find +GIT := git +GREP := grep +GZIP := gzip +PKG-CONFIG := pkg-config +SED := sed +SORT := sort +TAC := tac +TAR := tar +XARGS := xargs +XZ := xz endif # MAKEFILE_CMD_INCLUDED |