From e79194cf916340dca78970fe33ab83c744d20640 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Mon, 19 Aug 2019 11:52:22 +0200 Subject: [PATCH] build: move libgpiod.pc.in into lib/ This file is specific to the core library. Move it into the lib/ source directory. Signed-off-by: Bartosz Golaszewski --- Makefile.am | 3 --- configure.ac | 4 ++-- lib/Makefile.am | 3 +++ libgpiod.pc.in => lib/libgpiod.pc.in | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename libgpiod.pc.in => lib/libgpiod.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index 0f8c2b1..d3f57b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,3 @@ clean-local: EXTRA_DIST = Doxyfile endif - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libgpiod.pc diff --git a/configure.ac b/configure.ac index 1978eea..41321c1 100644 --- a/configure.ac +++ b/configure.ac @@ -206,10 +206,10 @@ then AC_MSG_NOTICE([help2man not found - man pages cannot be generated automatically]) fi -AC_CONFIG_FILES([libgpiod.pc - Makefile +AC_CONFIG_FILES([Makefile include/Makefile lib/Makefile + lib/libgpiod.pc tools/Makefile tests/Makefile tests/mockup/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index 3f797c4..e905d49 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -12,3 +12,6 @@ libgpiod_la_CFLAGS = -Wall -Wextra -g libgpiod_la_CFLAGS += -fvisibility=hidden -I$(top_srcdir)/include/ libgpiod_la_CFLAGS += -include $(top_builddir)/config.h libgpiod_la_LDFLAGS = -version-info $(subst .,:,$(ABI_VERSION)) + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libgpiod.pc diff --git a/libgpiod.pc.in b/lib/libgpiod.pc.in similarity index 100% rename from libgpiod.pc.in rename to lib/libgpiod.pc.in -- 2.30.2