Correctly specified pkgconfig Requires.private field

Change-Id: Iace43a6546fbbbe497084250fb70eba4b3bbe491

diff --git a/desktop-shell/configure.ac b/desktop-shell/configure.ac
index afc1dd0..afb0f46 100644 (file)
--- a/desktop-shell/configure.ac
+++ b/desktop-shell/configure.ac
@@ -24,6 +24,7 @@ LT_INIT([disable-static])
 
 PEPPER_DESKTOP_SHELL_MODULES="pepper"
 PKG_CHECK_MODULES(PEPPER_DESKTOP_SHELL, [$PEPPER_DESKTOP_SHELL_MODULES])
+AC_SUBST([PEPPER_DESKTOP_SHELL_REQUIRES], [$PEPPER_DESKTOP_SHELL_MODULES])
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/desktop-shell/src/pepper-desktop-shell.pc.in b/desktop-shell/src/pepper-desktop-shell.pc.in
index 570a19a..71b07cb 100644 (file)
--- a/desktop-shell/src/pepper-desktop-shell.pc.in
+++ b/desktop-shell/src/pepper-desktop-shell.pc.in
@@ -5,8 +5,10 @@ includedir=@includedir@
 libexecdir=@libexecdir@
 pkglibexecdir=${libexecdir}/@PACKAGE@
 
-Name: Pepper Libinput Backend Library
-Description: Pepper libinput backend library header and library files
-Version: @PEPPER_LIBINPUT_VERSION@
+Name: Pepper Desktop Shell Library
+Description: Pepper desktop shell library header and library files
+Version: @PEPPER_DESKTOP_SHELL_VERSION@
+
+Requires.private: @PEPPER_DESKTOP_SHELL_REQUIRES@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpepper-desktop-shell

diff --git a/drm/configure.ac b/drm/configure.ac
index 01181e8..5b2368a 100644 (file)
--- a/drm/configure.ac
+++ b/drm/configure.ac
@@ -25,6 +25,7 @@ PEPPER_DRM_MODULES="pepper pepper-render pepper-libinput pixman-1 wayland-server
                     libdrm gbm pepper-desktop-shell"
 
 PKG_CHECK_MODULES(PEPPER_DRM, [$PEPPER_DRM_MODULES])
+AC_SUBST([PEPPER_DRM_REQUIRES], [$PEPPER_DRM_MODULES])
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/drm/src/pepper-drm.pc.in b/drm/src/pepper-drm.pc.in
index e6b5600..84551b8 100644 (file)
--- a/drm/src/pepper-drm.pc.in
+++ b/drm/src/pepper-drm.pc.in
@@ -5,8 +5,10 @@ includedir=@includedir@
 libexecdir=@libexecdir@
 pkglibexecdir=${libexecdir}/@PACKAGE@
 
-Name: Pepper Libinput Backend Library
-Description: Pepper libinput backend library header and library files
-Version: @PEPPER_LIBINPUT_VERSION@
+Name: Pepper DRM Backend Library
+Description: Pepper DRM backend library header and library files
+Version: @PEPPER_DRM_VERSION@
+
+Requires.private: @PEPPER_DRM_REQUIRES@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpepper-drm

diff --git a/libinput/configure.ac b/libinput/configure.ac
index 7034d9d..907f06e 100644 (file)
--- a/libinput/configure.ac
+++ b/libinput/configure.ac
@@ -24,6 +24,7 @@ LT_INIT([disable-static])
 
 PEPPER_LIBINPUT_MODULES="pepper wayland-server libinput"
 PKG_CHECK_MODULES(PEPPER_LIBINPUT, [$PEPPER_LIBINPUT_MODULES])
+AC_SUBST([PEPPER_LIBINPUT_REQUIRES], [$PEPPER_LIBINPUT_MODULES])
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/libinput/src/pepper-libinput.pc.in b/libinput/src/pepper-libinput.pc.in
index 0b5f9d2..c3ad002 100644 (file)
--- a/libinput/src/pepper-libinput.pc.in
+++ b/libinput/src/pepper-libinput.pc.in
@@ -8,5 +8,7 @@ pkglibexecdir=${libexecdir}/@PACKAGE@
 Name: Pepper Libinput Backend Library
 Description: Pepper libinput backend library header and library files
 Version: @PEPPER_LIBINPUT_VERSION@
+
+Requires.private: @PEPPER_LIBINPUT_REQUIRES@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpepper-libinput

diff --git a/pepper/configure.ac b/pepper/configure.ac
index d4fb8a4..900b221 100644 (file)
--- a/pepper/configure.ac
+++ b/pepper/configure.ac
@@ -23,6 +23,7 @@ LT_INIT([disable-static])
 
 PEPPER_MODULES="wayland-server pixman-1"
 PKG_CHECK_MODULES(PEPPER, [$PEPPER_MODULES])
+AC_SUBST([PEPPER_REQUIRES], [$PEPPER_MODULES])
 
 # Output files
 AC_CONFIG_FILES([

diff --git a/pepper/src/pepper.pc.in b/pepper/src/pepper.pc.in
index 7de619d..9384966 100644 (file)
--- a/pepper/src/pepper.pc.in
+++ b/pepper/src/pepper.pc.in
@@ -8,5 +8,7 @@ pkglibexecdir=${libexecdir}/@PACKAGE@
 Name: Pepper Library
 Description: Pepper library header and library files
 Version: @PEPPER_VERSION@
+
+Requires.private: @PEPPER_REQUIRES@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpepper

diff --git a/render/configure.ac b/render/configure.ac
index 4717f4f..fdfeb73 100644 (file)
--- a/render/configure.ac
+++ b/render/configure.ac
@@ -21,7 +21,7 @@ AC_PROG_CC
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-PKG_CHECK_MODULES(PEPPER_RENDER, [pepper])
+PEPPER_RENDER_MODULES="pepper"
 
 # pixman renderer
 AC_ARG_ENABLE(pixman,
@@ -32,7 +32,7 @@ AM_CONDITIONAL(ENABLE_PIXMAN, test $enable_pixman = yes)
 
 if test $enable_pixman = yes; then
     AC_DEFINE(ENABLE_PIXMAN, 1, [Enable pixman renderer])
-    PKG_CHECK_MODULES(PIXMAN, [pixman-1])
+    PEPPER_RENDER_MODULES="$PEPPER_RENDER_MODULES pixman-1"
 fi
 
 # gl renderer
@@ -44,9 +44,12 @@ AM_CONDITIONAL(ENABLE_GL, test $enable_gl = yes)
 
 if test $enable_gl = yes; then
     AC_DEFINE(ENABLE_GL, 1, [Enable OpenGL renderer])
-    PKG_CHECK_MODULES(GL, [egl glesv2])
+    PEPPER_RENDER_MODULES="$PEPPER_RENDER_MODULES egl glesv2"
 fi
 
+PKG_CHECK_MODULES(PEPPER_RENDER, [$PEPPER_RENDER_MODULES])
+AC_SUBST([PEPPER_RENDER_REQUIRES], [$PEPPER_RENDER_MODULES])
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile

diff --git a/render/src/pepper-render.pc.in b/render/src/pepper-render.pc.in
index 790ab7c..2ef89b4 100644 (file)
--- a/render/src/pepper-render.pc.in
+++ b/render/src/pepper-render.pc.in
@@ -8,5 +8,7 @@ pkglibexecdir=${libexecdir}/@PACKAGE@
 Name: Pepper Rendering Library
 Description: Pepper rendering library header and library files
 Version: @PEPPER_RENDER_VERSION@
+
+Requires.private: @PEPPER_RENDER_REQUIRES@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpepper-render

diff --git a/utils/configure.ac b/utils/configure.ac
index 0fde289..dd2b9ca 100644 (file)
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -21,7 +21,10 @@ AC_PROG_CC
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-PKG_CHECK_MODULES(PEPPER_UTILS, [pepper])
+PEPPER_UTILS_MODULES="pepper"
+
+PKG_CHECK_MODULES(PEPPER_UTILS, [$PEPPER_UTILS_MODULES])
+AC_SUBST([PEPPER_UTILS_REQUIRES], [$PEPPER_UTILS_MODULES])
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/utils/src/pepper-utils.pc.in b/utils/src/pepper-utils.pc.in
index 97b1b75..bd437d3 100644 (file)
--- a/utils/src/pepper-utils.pc.in
+++ b/utils/src/pepper-utils.pc.in
@@ -8,5 +8,7 @@ pkglibexecdir=${libexecdir}/@PACKAGE@
 Name: Pepper Utility Library
 Description: Pepper utility library header and library files
 Version: @PEPPER_UTILS_VERSION@
+
+Requires.private: @PEPPER_UTILS_REQUIRES@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpepper-utils

diff --git a/wayland/configure.ac b/wayland/configure.ac
index d23a3af..468d507 100644 (file)
--- a/wayland/configure.ac
+++ b/wayland/configure.ac
@@ -21,8 +21,9 @@ AC_PROG_CC
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-PEPPER_WAYLAND_MODULES="pepper pepper-render wayland-server wayland-client pixman-1"
+PEPPER_WAYLAND_MODULES="pepper pepper-render wayland-server wayland-client pixman-1 pepper-utils"
 PKG_CHECK_MODULES(PEPPER_WAYLAND, [$PEPPER_WAYLAND_MODULES])
+AC_SUBST([PEPPER_WAYLAND_REQUIRES], [$PEPPER_WAYLAND_MODULES])
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/wayland/src/pepper-wayland.pc.in b/wayland/src/pepper-wayland.pc.in
index 55e1b20..8a53a36 100644 (file)
--- a/wayland/src/pepper-wayland.pc.in
+++ b/wayland/src/pepper-wayland.pc.in
@@ -8,5 +8,7 @@ pkglibexecdir=${libexecdir}/@PACKAGE@
 Name: Pepper Wayland Backend Library
 Description: Pepper wayland backend library header and library files
 Version: @PEPPER_WAYLAND_VERSION@
+
+Requires.private: @PEPPER_WAYLAND_REQUIRES@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpepper-wayland

diff --git a/x11/configure.ac b/x11/configure.ac
index 2b58c70..5576b5b 100644 (file)
--- a/x11/configure.ac
+++ b/x11/configure.ac
@@ -23,6 +23,7 @@ LT_INIT([disable-static])
 
 PEPPER_X11_MODULES="pepper pepper-render x11 xcb-shm x11-xcb wayland-server pixman-1"
 PKG_CHECK_MODULES(PEPPER_X11, [$PEPPER_X11_MODULES])
+AC_SUBST([PEPPER_X11_REQUIRES], [$PEPPER_X11_MODULES])
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/x11/src/pepper-x11.pc.in b/x11/src/pepper-x11.pc.in
index c5e533d..056ce49 100644 (file)
--- a/x11/src/pepper-x11.pc.in
+++ b/x11/src/pepper-x11.pc.in
@@ -8,5 +8,7 @@ pkglibexecdir=${libexecdir}/@PACKAGE@
 Name: Pepper X11 Backend Library
 Description: Pepper x11 backend library header and library files
 Version: @PEPPER_X11_VERSION@
+
+Requires.private: @PEPPER_X11_REQUIRES@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpepper-x11