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>

diff --git a/lib/build-src.mk b/lib/build-src.mk
index ab3c741d971f6e3ac0746e035c50499e553b298f..7c942a81ee8d41b2f013e1103d126d057c64cec1 100644 (file)
--- 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 2704cb3d0e0f069b8bc7a196b33c578a077a3aa1..643e4dbd83038bc05026d83fb32548e2f407a17d 100644 (file)
--- 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