build: Search internal include path and libs before external ones

Include dir is moved to ${includedir}/pepper ie. /usr/include/pepper.

Change-Id: If747f0785d1cf2f7f8e0a01ff0786aac689c7755

diff --git a/configure.ac b/configure.ac
index 54a12ae..612be06 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,11 +25,9 @@ LT_INIT([disable-static])
 PEPPER_REQUIRES="wayland-server pixman-1"
 PKG_CHECK_MODULES(PEPPER, [$PEPPER_REQUIRES])
 
-PEPPER_INTERNAL_CFLAGS="$PEPPER_CFLAGS -I\$(top_srcdir)/src/lib/pepper"
-PEPPER_INTERNAL_LIBS="\$(top_srcdir)/src/lib/pepper/libpepper.la"
+PEPPER_DIR="-I\$(top_srcdir)/src/lib/pepper"
+PEPPER_LIB="\$(top_srcdir)/src/lib/pepper/libpepper.la"
 
-AC_SUBST(PEPPER_INTERNAL_CFLAGS)
-AC_SUBST(PEPPER_INTERNAL_LIBS)
 AC_SUBST(PEPPER_REQUIRES)
 
 # pepper-libinput
@@ -37,21 +35,27 @@ PEPPER_LIBINPUT_REQUIRES="libinput"
 PKG_CHECK_MODULES(PEPPER_LIBINPUT, [$PEPPER_LIBINPUT_REQUIRES])
 PEPPER_LIBINPUT_REQUIRES="$PEPPER_LIBINPUT_REQUIRES pepper"
 
-PEPPER_LIBINPUT_INTERNAL_CFLAGS="$PEPPER_INTERNAL_CFLAGS -I\$(top_srcdir)/src/lib/libinput"
-PEPPER_LIBINPUT_INTERNAL_LIBS="\$(top_srcdir)/src/lib/libinput/libpepper-libinput.la"
+PEPPER_LIBINPUT_DIR="-I\$(top_srcdir)/src/lib/libinput"
+PEPPER_LIBINPUT_LIB="\$(top_srcdir)/src/lib/libinput/libpepper-libinput.la"
 
-AC_SUBST(PEPPER_LIBINPUT_INTERNAL_CFLAGS)
-AC_SUBST(PEPPER_LIBINPUT_INTERNAL_LIBS)
+PEPPER_LIBINPUT_CFLAGS="$PEPPER_DIR $PEPPER_LIBINPUT_CFLAGS $PEPPER_CFLAGS"
+PEPPER_LIBINPUT_LIBS="$PEPPER_LIB $PEPPER_LIBINPUT_LIBS"
+
+AC_SUBST(PEPPER_LIBINPUT_CFLAGS)
+AC_SUBST(PEPPER_LIBINPUT_LIBS)
 AC_SUBST(PEPPER_LIBINPUT_REQUIRES)
 
 # pepper-desktop-shell
 PEPPER_DESKTOP_SHELL_REQUIRES="pepper"
 
-PEPPER_DESKTOP_SHELL_INTERNAL_CFLAGS="$PEPPER_INTERNAL_CFLAGS -I\$(top_srcdir)/src/lib/desktop-shell"
-PEPPER_DESKTOP_SHELL_INTERNAL_LIBS="\$(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la"
+PEPPER_DESKTOP_SHELL_DIR="-I\$(top_srcdir)/src/lib/desktop-shell"
+PEPPER_DESKTOP_SHELL_LIB="\$(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la"
+
+PEPPER_DESKTOP_SHELL_CFLAGS="$PEPPER_DIR $PEPPER_CFLAGS"
+PEPPER_DESKTOP_SHELL_LIBS="$PEPPER_LIB"
 
-AC_SUBST(PEPPER_DESKTOP_SHELL_INTERNAL_CFLAGS)
-AC_SUBST(PEPPER_DESKTOP_SHELL_INTERNAL_LIBS)
+AC_SUBST(PEPPER_DESKTOP_SHELL_CFLAGS)
+AC_SUBST(PEPPER_DESKTOP_SHELL_LIBS)
 AC_SUBST(PEPPER_DESKTOP_SHELL_REQUIRES)
 
 # pepper-render
@@ -59,33 +63,44 @@ PEPPER_RENDER_REQUIRES="pixman-1 egl glesv2"
 PKG_CHECK_MODULES(PEPPER_RENDER, [$PEPPER_RENDER_REQUIRES])
 PEPPER_RENDER_REQUIRES="$PEPPER_RENDER_REQUIRES pepper"
 
-PEPPER_RENDER_INTERNAL_CFLAGS="$PEPPER_INTERNAL_CFLAGS -I\$(top_srcdir)/src/lib/render"
-PEPPER_RENDER_INTERNAL_LIBS="\$(top_srcdir)/src/lib/render/libpepper-render.la"
+PEPPER_RENDER_DIR="-I\$(top_srcdir)/src/lib/render"
+PEPPER_RENDER_LIB="\$(top_srcdir)/src/lib/render/libpepper-render.la"
+
+PEPPER_RENDER_CFLAGS="$PEPPER_DIR $PEPPER_RENDER_CFLAGS $PEPPER_CFLAGS"
+PEPPER_RENDER_LIBS="$PEPPER_LIB $PEPPER_RENDER_LIBS"
 
-AC_SUBST(PEPPER_RENDER_INTERNAL_CFLAGS)
-AC_SUBST(PEPPER_RENDER_INTERNAL_LIBS)
+AC_SUBST(PEPPER_RENDER_CFLAGS)
+AC_SUBST(PEPPER_RENDER_LIBS)
 AC_SUBST(PEPPER_RENDER_REQUIRES)
 
 # pepper-drm
 PEPPER_DRM_REQUIRES="libdrm gbm"
 PKG_CHECK_MODULES(PEPPER_DRM, [$PEPPER_DRM_REQUIRES])
-PEPPER_DRM_REQUIRES="$PEPPER_DRM_REQUIRES pepper pepper-render"
+PEPPER_DRM_REQUIRES="$PEPPER_DRM_REQUIRES pepper pepper-render pepper-libinput"
 
-PEPPER_DRM_INTERNAL_CFLAGS="$PEPPER_CFLAGS $PEPPER_RENDER_CFLAGS -I\$(top_srcdir)/src/lib/drm"
-PEPPER_DRM_INTERNAL_LIBS="\$(top_srcdir)/src/lib/drm/libpepper-drm.la"
+PEPPER_DRM_DIR="-I\$(top_srcdir)/src/lib/drm"
+PEPPER_DRM_LIB="\$(top_srcdir)/src/lib/drm/libpepper-drm.la"
 
-AC_SUBST(PEPPER_DRM_INTERNAL_CFLAGS)
-AC_SUBST(PEPPER_DRM_INTERNAL_LIBS)
+PEPPER_DRM_CFLAGS="$PEPPER_DIR $PEPPER_RENDER_DIR $PEPPER_LIBINPUT_DIR $PEPPER_DRM_CFLAGS"
+PEPPER_DRM_CFLAGS="$PEPPER_DRM_CFLAGS $PEPPER_CFLAGS"
+PEPPER_DRM_LIBS="$PEPPER_LIB $PEPPER_RENDER_LIB $PEPPER_LIBINPUT_LIB $PEPPER_DRM_LIBS"
+
+AC_SUBST(PEPPER_DRM_CFLAGS)
+AC_SUBST(PEPPER_DRM_LIBS)
 AC_SUBST(PEPPER_DRM_REQUIRES)
 
 # pepper-fbdev
 PEPPER_FBDEV_REQUIRES="pepper pepper-render"
 
-PEPPER_FBDEV_INTERNAL_CFLAGS="$PEPPER_CFLAGS $PEPPER_RENDER_CFLAGS -I\$(top_srcdir)/src/lib/fbdev"
-PEPPER_FBDEV_INTERNAL_LIBS="\$(top_srcdir)/src/lib/fbdev/libpepper-fbdev.la"
+PEPPER_FBDEV_DIR="-I\$(top_srcdir)/src/lib/fbdev"
+PEPPER_FBDEV_LIB="\$(top_srcdir)/src/lib/fbdev/libpepper-fbdev.la"
+
+PEPPER_FBDEV_CFLAGS="$PEPPER_DIR $PEPPER_RENDER_DIR $PEPPER_FBDEV_CFLAGS"
+PEPPER_FBDEV_CFLAGS="$PEPPER_FBDEV_CFLAGS $PEPPER_CFLAGS"
+PEPPER_FBDEV_LIBS="$PEPPER_LIB $PEPPER_RENDER_LIB $PEPPER_LIBINPUT_LIB $PEPPER_FBDEV_LIBS"
 
-AC_SUBST(PEPPER_FBDEV_INTERNAL_CFLAGS)
-AC_SUBST(PEPPER_FBDEV_INTERNAL_LIBS)
+AC_SUBST(PEPPER_FBDEV_CFLAGS)
+AC_SUBST(PEPPER_FBDEV_LIBS)
 AC_SUBST(PEPPER_FBDEV_REQUIRES)
 
 # pepper-wayland
@@ -93,11 +108,14 @@ PEPPER_WAYLAND_REQUIRES="wayland-client"
 PKG_CHECK_MODULES(PEPPER_WAYLAND, [$PEPPER_WAYLAND_REQUIRES])
 PEPPER_WAYLAND_REQUIRES="$PEPPER_WAYLAND_REQUIRES pepper pepper-render"
 
-PEPPER_WAYLAND_INTERNAL_CFLAGS="$PEPPER_CFLAGS $PEPPER_RENDER_CFLAGS -I\$(top_srcdir)/src/lib/wayland"
-PEPPER_WAYLAND_INTERNAL_LIBS="\$(top_srcdir)/src/lib/wayland/libpepper-wayland.la"
+PEPPER_WAYLAND_DIR="-I\$(top_srcdir)/src/lib/wayland"
+PEPPER_WAYLAND_LIB="\$(top_srcdir)/src/lib/wayland/libpepper-wayland.la"
 
-AC_SUBST(PEPPER_WAYLAND_INTERNAL_CFLAGS)
-AC_SUBST(PEPPER_WAYLAND_INTERNAL_LIBS)
+PEPPER_WAYLAND_CFLAGS="$PEPPER_DIR $PEPPER_RENDER_DIR $PEPPER_WAYLAND_CFLAGS $PEPPER_CFLAGS"
+PEPPER_WAYLAND_LIBS="$PEPPER_LIB $PEPPER_RENDER_LIB $PEPPER_WAYLAND_LIBS"
+
+AC_SUBST(PEPPER_WAYLAND_CFLAGS)
+AC_SUBST(PEPPER_WAYLAND_LIBS)
 AC_SUBST(PEPPER_WAYLAND_REQUIRES)
 
 # pepper-x11
@@ -106,17 +124,22 @@ AC_ARG_ENABLE(x11,
                              [disable x11 backend module]),
               enable_x11=$enableval,
               enable_x11=yes)
+
 AM_CONDITIONAL(ENABLE_X11, test x$enable_x11 = xyes)
+
 if test x$enable_x11 = xyes; then
     PEPPER_X11_REQUIRES="x11 xcb-shm x11-xcb"
     PKG_CHECK_MODULES(PEPPER_X11, [$PEPPER_X11_REQUIRES])
     PEPPER_X11_REQUIRES="$PEPPER_X11_REQUIRES pepper pepper-render"
 
-    PEPPER_X11_INTERNAL_CFLAGS="$PEPPER_CFLAGS $PEPPER_RENDER_CFLAGS -I\$(top_srcdir)/src/lib/x11"
-    PEPPER_X11_INTERNAL_LIBS="\$(top_srcdir)/src/lib/x11/libpepper-x11.la"
+    PEPPER_X11_DIR="-I\$(top_srcdir)/src/lib/x11"
+    PEPPER_X11_LIB="\$(top_srcdir)/src/lib/x11/libpepper-x11.la"
+
+    PEPPER_X11_CFLAGS="$PEPPER_DIR $PEPPER_RENDER_DIR $PEPPER_X11_CFLAGS $PEPPER_CFLAGS"
+    PEPPER_X11_LIBS="$PEPPER_LIB $PEPPER_RENDER_LIB $PEPPER_X11_LIBS"
 
-    AC_SUBST(PEPPER_X11_INTERNAL_CFLAGS)
-    AC_SUBST(PEPPER_X11_INTERNAL_LIBS)
+    AC_SUBST(PEPPER_X11_CFLAGS)
+    AC_SUBST(PEPPER_X11_LIBS)
     AC_SUBST(PEPPER_X11_REQUIRES)
 fi
 
@@ -125,15 +148,32 @@ DOCTOR_REQUIRES="wayland-server"
 PKG_CHECK_MODULES(DOCTOR, [$DOCTOR_REQUIRES])
 DOCTOR_REQUIRES="$DOCTOR_REQUIRES pepper pepper-drm pepper-desktop-shell"
 
-DOCTOR_CFLAGS="$DOCTOR_CFLAGS $PEPPER_CFLAGS $PEPPER_DRM_CFLAGS $PEPPER_DEKSTOP_SHELL_CFLAGS"
-DOCTOR_LIBS="$DOCTOR_CFLAGS $PEPPER_LIBS $PEPPER_DRM_LIBS $PEPPER_DESKTOP_SHELL_LIBS"
+DOCTOR_CFLAGS="$PEPPER_DIR $PEPPER_DRM_DIR $PEPPER_DESKTOP_SHELL_DIR $DOCTOR_CFLAGS"
+DOCTOR_LIBS="$PEPPER_LIB $PEPPER_DRM_LIB $PEPPER_DESKTOP_SHELL_LIB $DOCTOR_LIBS"
 
 AC_SUBST(DOCTOR_CFLAGS)
 AC_SUBST(DOCTOR_LIBS)
 
 # sample
-PKG_CHECK_MODULES(WAYLAND_SERVER, ["wayland-server"])
-PKG_CHECK_MODULES(WAYLAND_CLIENT, ["wayland-client"])
+SAMPLES_REQUIRES="wayland-server wayland-client"
+PKG_CHECK_MODULES(SAMPLES, $[SAMPLES_REQUIRES])
+
+SAMPLES_CFLAGS="$PEPPER_DIR $PEPPER_DESKTOP_SHELL_DIR $PEPPER_RENDER_DIR $SAMPLES_CFLAGS"
+SAMPLES_CFLAGS="$PEPPER_LIBINPUT_DIR $PEPPER_DRM_DIR $PEPPER_FBDEV_DIR $SAMPLES_CFLAGS"
+SAMPLES_CFLAGS="$PEPPER_WAYLAND_DIR $PEPPER_X11_DIR $SAMPLES_CFLAGS"
+SAMPLES_CFLAGS="$SAMPLES_CFLAGS $PEPPER_CFLAGS"
+
+SAMPLES_LIBS="$PEPPER_LIB $PEPPER_LIBS $SAMPLES_LIBS"
+SAMPLES_LIBS="$PEPPER_DESKTOP_SHELL_LIB $PEPPER_DESKTOP_SHELL_LIBS $SAMPLES_LIBS"
+SAMPLES_LIBS="$PEPPER_RENDER_LIB $PEPPER_RENDER_LIBS $SAMPLES_LIBS"
+SAMPLES_LIBS="$PEPPER_LIBINPUT_LIB $PEPPER_LIBINPUT_LIBS $SAMPLES_LIBS"
+SAMPLES_LIBS="$PEPPER_DRM_LIB $PEPPER_DRM_LIBS $SAMPLES_LIBS"
+SAMPLES_LIBS="$PEPPER_FBDEV_LIB $PEPPER_FBDEV_LIBS $SAMPLES_LIBS"
+SAMPLES_LIBS="$PEPPER_WAYLAND_LIB $PEPPER_WAYLAND_LIBS $SAMPLES_LIBS"
+SAMPLES_LIBS="$PEPPER_X11_LIB $PEPPER_X11_LIBS $SAMPLES_LIBS"
+
+AC_SUBST(SAMPLES_CFLAGS)
+AC_SUBST(SAMPLES_LIBS)
 
 # wayland-scanner
 AC_PATH_PROG([wayland_scanner], [wayland-scanner])

diff --git a/pkgconfig/pepper-desktop-shell.pc.in b/pkgconfig/pepper-desktop-shell.pc.in
index 71b07cb..fe84037 100644 (file)
--- a/pkgconfig/pepper-desktop-shell.pc.in
+++ b/pkgconfig/pepper-desktop-shell.pc.in
@@ -10,5 +10,5 @@ Description: Pepper desktop shell library header and library files
 Version: @PEPPER_DESKTOP_SHELL_VERSION@
 
 Requires.private: @PEPPER_DESKTOP_SHELL_REQUIRES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/pepper
 Libs: -L${libdir} -lpepper-desktop-shell

diff --git a/pkgconfig/pepper-drm.pc.in b/pkgconfig/pepper-drm.pc.in
index 84551b8..e187ff5 100644 (file)
--- a/pkgconfig/pepper-drm.pc.in
+++ b/pkgconfig/pepper-drm.pc.in
@@ -10,5 +10,5 @@ Description: Pepper DRM backend library header and library files
 Version: @PEPPER_DRM_VERSION@
 
 Requires.private: @PEPPER_DRM_REQUIRES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/pepper
 Libs: -L${libdir} -lpepper-drm

diff --git a/pkgconfig/pepper-fbdev.pc.in b/pkgconfig/pepper-fbdev.pc.in
index 36e9d77..709547f 100644 (file)
--- a/pkgconfig/pepper-fbdev.pc.in
+++ b/pkgconfig/pepper-fbdev.pc.in
@@ -10,5 +10,5 @@ Description: Pepper FBDEV backend library header and library files
 Version: @PEPPER_FBDEV_VERSION@
 
 Requires.private: @PEPPER_FBDEV_REQUIRES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/pepper
 Libs: -L${libdir} -lpepper-fbdev

diff --git a/pkgconfig/pepper-libinput.pc.in b/pkgconfig/pepper-libinput.pc.in
index c3ad002..fd997a8 100644 (file)
--- a/pkgconfig/pepper-libinput.pc.in
+++ b/pkgconfig/pepper-libinput.pc.in
@@ -10,5 +10,5 @@ Description: Pepper libinput backend library header and library files
 Version: @PEPPER_LIBINPUT_VERSION@
 
 Requires.private: @PEPPER_LIBINPUT_REQUIRES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/pepper
 Libs: -L${libdir} -lpepper-libinput

diff --git a/pkgconfig/pepper-render.pc.in b/pkgconfig/pepper-render.pc.in
index 2ef89b4..e2230f6 100644 (file)
--- a/pkgconfig/pepper-render.pc.in
+++ b/pkgconfig/pepper-render.pc.in
@@ -10,5 +10,5 @@ Description: Pepper rendering library header and library files
 Version: @PEPPER_RENDER_VERSION@
 
 Requires.private: @PEPPER_RENDER_REQUIRES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/pepper
 Libs: -L${libdir} -lpepper-render

diff --git a/pkgconfig/pepper-wayland.pc.in b/pkgconfig/pepper-wayland.pc.in
index 8a53a36..3990e95 100644 (file)
--- a/pkgconfig/pepper-wayland.pc.in
+++ b/pkgconfig/pepper-wayland.pc.in
@@ -10,5 +10,5 @@ Description: Pepper wayland backend library header and library files
 Version: @PEPPER_WAYLAND_VERSION@
 
 Requires.private: @PEPPER_WAYLAND_REQUIRES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/pepper
 Libs: -L${libdir} -lpepper-wayland

diff --git a/pkgconfig/pepper-x11.pc.in b/pkgconfig/pepper-x11.pc.in
index 056ce49..6612bf1 100644 (file)
--- a/pkgconfig/pepper-x11.pc.in
+++ b/pkgconfig/pepper-x11.pc.in
@@ -10,5 +10,5 @@ Description: Pepper x11 backend library header and library files
 Version: @PEPPER_X11_VERSION@
 
 Requires.private: @PEPPER_X11_REQUIRES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/pepper
 Libs: -L${libdir} -lpepper-x11

diff --git a/pkgconfig/pepper.pc.in b/pkgconfig/pepper.pc.in
index 9384966..30c2a05 100644 (file)
--- a/pkgconfig/pepper.pc.in
+++ b/pkgconfig/pepper.pc.in
@@ -10,5 +10,5 @@ Description: Pepper library header and library files
 Version: @PEPPER_VERSION@
 
 Requires.private: @PEPPER_REQUIRES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/pepper
 Libs: -L${libdir} -lpepper

diff --git a/src/lib/desktop-shell/Makefile.am b/src/lib/desktop-shell/Makefile.am
index eef715b..4b2f662 100644 (file)
--- a/src/lib/desktop-shell/Makefile.am
+++ b/src/lib/desktop-shell/Makefile.am
@@ -1,10 +1,12 @@
 lib_LTLIBRARIES = libpepper-desktop-shell.la
-include_HEADERS = pepper-desktop-shell.h
+
+libpepper_desktop_includedir=$(includedir)/pepper
+libpepper_desktop_include_HEADERS = pepper-desktop-shell.h
 
 libpepper_desktop_shell_la_CFLAGS = -I$(srcdir)/protocol/           \
-                                    $(PEPPER_INTERNAL_CFLAGS)
+                                    $(PEPPER_DESKTOP_SHELL_CFLAGS)
 
-libpepper_desktop_shell_la_LIBADD = $(PEPPER_INTERNAL_LIBS)
+libpepper_desktop_shell_la_LIBADD = $(PEPPER_DESKTOP_SHELL_LIBS)
 
 libpepper_desktop_shell_la_SOURCES = desktop-shell-internal.h                   \
                                      shell.c                                    \

diff --git a/src/lib/drm/Makefile.am b/src/lib/drm/Makefile.am
index 988949f..c7f61f1 100644 (file)
--- a/src/lib/drm/Makefile.am
+++ b/src/lib/drm/Makefile.am
@@ -1,15 +1,10 @@
 lib_LTLIBRARIES = libpepper-drm.la
-include_HEADERS = pepper-drm.h
 
-libpepper_drm_la_CFLAGS = $(PEPPER_DRM_CFLAGS)                  \
-                          $(PEPPER_INTERNAL_CFLAGS)             \
-                          $(PEPPER_RENDER_INTERNAL_CFLAGS)      \
-                          $(PEPPER_LIBINPUT_INTERNAL_CFLAGS)
+libpepper_drm_includedir=$(includedir)/pepper
+libpepper_drm_include_HEADERS = pepper-drm.h
 
-libpepper_drm_la_LIBADD = $(PEPPER_DRM_LIBS)                \
-                          $(PEPPER_INTERNAL_LIBS)           \
-                          $(PEPPER_RENDER_INTERNAL_LIBS)    \
-                          $(PEPPER_LIBINPUT_INTERNAL_LIBS)
+libpepper_drm_la_CFLAGS = $(PEPPER_DRM_CFLAGS)
+libpepper_drm_la_LIBADD = $(PEPPER_DRM_LIBS)
 
 libpepper_drm_la_SOURCES =  drm-internal.h  \
                             drm-common.c    \

diff --git a/src/lib/fbdev/Makefile.am b/src/lib/fbdev/Makefile.am
index 756b31c..0191514 100644 (file)
--- a/src/lib/fbdev/Makefile.am
+++ b/src/lib/fbdev/Makefile.am
@@ -1,13 +1,10 @@
 lib_LTLIBRARIES = libpepper-fbdev.la
-include_HEADERS = pepper-fbdev.h
 
-libpepper_fbdev_la_CFLAGS = $(PEPPER_INTERNAL_CFLAGS)           \
-                            $(PEPPER_RENDER_INTERNAL_CFLAGS)    \
-                            $(PEPPER_LIBINPUT_INTERNAL_CFLAGS)
+libpepper_fbdev_includedir=$(includedir)/pepper
+libpepper_fbdev_include_HEADERS = pepper-fbdev.h
 
-libpepper_fbdev_la_LIBADD = $(PEPPER_INTERNAL_LIBS)             \
-                            $(PEPPER_RENDER_INTERNAL_LIBS)      \
-                            $(PEPPER_LIBINPUT_INTERNAL_LIBS)
+libpepper_fbdev_la_CFLAGS = $(PEPPER_FBDEV_CFLAGS)
+libpepper_fbdev_la_LIBADD = $(PEPPER_FBDEV_LIBS)
 
 libpepper_fbdev_la_SOURCES = fbdev-internal.h   \
                              fbdev-common.c     \

diff --git a/src/lib/libinput/Makefile.am b/src/lib/libinput/Makefile.am
index 6a14a5e..2bf638a 100644 (file)
--- a/src/lib/libinput/Makefile.am
+++ b/src/lib/libinput/Makefile.am
@@ -1,11 +1,10 @@
 lib_LTLIBRARIES = libpepper-libinput.la
-include_HEADERS = pepper-libinput.h
 
-libpepper_libinput_la_CFLAGS = $(PEPPER_LIBINPUT_CFLAGS)    \
-                               $(PEPPER_INTERNAL_CFLAGS)
+libpepper_libinput_includedir=$(includedir)/pepper
+libpepper_libinput_include_HEADERS = pepper-libinput.h
 
-libpepper_libinput_la_LIBADD = $(PEPPER_LIBINPUT_LIBS)  \
-                               $(PEPPER_INTERNAL_LIBS)
+libpepper_libinput_la_CFLAGS = $(PEPPER_LIBINPUT_CFLAGS)
+libpepper_libinput_la_LIBADD = $(PEPPER_LIBINPUT_LIBS)
 
 libpepper_libinput_la_SOURCES = libinput-internal.h \
                                 libinput.c

diff --git a/src/lib/pepper/Makefile.am b/src/lib/pepper/Makefile.am
index ea2c285..c2b2aa1 100644 (file)
--- a/src/lib/pepper/Makefile.am
+++ b/src/lib/pepper/Makefile.am
@@ -1,5 +1,6 @@
 lib_LTLIBRARIES = libpepper.la
-include_HEADERS = pepper.h pepper-utils.h pepper-output-backend.h pepper-input-backend.h
+libpepper_includedir=$(includedir)/pepper
+libpepper_include_HEADERS = pepper.h pepper-utils.h pepper-output-backend.h pepper-input-backend.h
 
 libpepper_la_CFLAGS = $(PEPPER_CFLAGS)
 libpepper_la_LIBADD = $(PEPPER_LIBS) -lm

diff --git a/src/lib/render/Makefile.am b/src/lib/render/Makefile.am
index 65bbdff..ec6a058 100644 (file)
--- a/src/lib/render/Makefile.am
+++ b/src/lib/render/Makefile.am
@@ -1,23 +1,19 @@
-lib_LTLIBRARIES =
-include_HEADERS =
+lib_LTLIBRARIES = libpepper-render.la
+libpepper_render_includedir=$(includedir)/pepper
+libpepper_render_include_HEADERS = pepper-render.h
 
-# pepper-render library
-lib_LTLIBRARIES += libpepper-render.la
-include_HEADERS += pepper-render.h
-
-libpepper_render_la_CFLAGS = $(PEPPER_RENDER_CFLAGS) $(PEPPER_INTERNAL_CFLAGS)
-
-libpepper_render_la_LIBADD = $(PEPPER_RENDER_LIBS) $(PEPPER_INTERNAL_LIBS)
+libpepper_render_la_CFLAGS = $(PEPPER_RENDER_CFLAGS)
+libpepper_render_la_LIBADD = $(PEPPER_RENDER_LIBS)
 
 libpepper_render_la_SOURCES = pepper-render.h           \
                              pepper-render-internal.h  \
                              renderer.c
 
 # pixman renderer
-include_HEADERS += pepper-pixman-renderer.h
+libpepper_render_include_HEADERS += pepper-pixman-renderer.h
 libpepper_render_la_SOURCES += pixman-renderer.c
 
 # gl renderer
-include_HEADERS += pepper-gl-renderer.h
+libpepper_render_include_HEADERS += pepper-gl-renderer.h
 libpepper_render_la_SOURCES += gl-renderer.c    \
                                eglextwayland.h

diff --git a/src/lib/wayland/Makefile.am b/src/lib/wayland/Makefile.am
index 13c8509..88935dc 100644 (file)
--- a/src/lib/wayland/Makefile.am
+++ b/src/lib/wayland/Makefile.am
@@ -1,13 +1,10 @@
 lib_LTLIBRARIES = libpepper-wayland.la
-include_HEADERS = pepper-wayland.h
 
-libpepper_wayland_la_CFLAGS = $(PEPPER_WAYLAND_CFLAGS)          \
-                              $(PEPPER_INTERNAL_CFLAGS)         \
-                              $(PEPPER_RENDER_INTERNAL_CFLAGS)
+libpepper_wayland_includedir=$(includedir)/pepper
+libpepper_wayland_include_HEADERS = pepper-wayland.h
 
-libpepper_wayland_la_LIBADD = $(PEPPER_WAYLAND_LIBS)            \
-                              $(PEPPER_INTERNAL_LIBS)           \
-                              $(PEPPER_RENDER_INTERNAL_LIBS)
+libpepper_wayland_la_CFLAGS = $(PEPPER_WAYLAND_CFLAGS)
+libpepper_wayland_la_LIBADD = $(PEPPER_WAYLAND_LIBS)
 
 libpepper_wayland_la_SOURCES =  pepper-wayland.h        \
                                 wayland-internal.h      \

diff --git a/src/lib/x11/Makefile.am b/src/lib/x11/Makefile.am
index 62d30a7..2d920d2 100644 (file)
--- a/src/lib/x11/Makefile.am
+++ b/src/lib/x11/Makefile.am
@@ -1,13 +1,10 @@
 lib_LTLIBRARIES = libpepper-x11.la
-include_HEADERS = pepper-x11.h
 
-libpepper_x11_la_CFLAGS = $(PEPPER_X11_CFLAGS)              \
-                          $(PEPPER_INTERNAL_CFLAGS)         \
-                          $(PEPPER_RENDER_INTERNAL_CFLAGS)
+libpepper_x11_includedir=$(includedir)/pepper
+libpepper_x11_include_HEADERS = pepper-x11.h
 
-libpepper_x11_la_LIBADD = $(PEPPER_X11_LIBS)                \
-                          $(PEPPER_INTERNAL_LIBS)           \
-                          $(PEPPER_RENDER_INTERNAL_LIBS)
+libpepper_x11_la_CFLAGS = $(PEPPER_X11_CFLAGS)
+libpepper_x11_la_LIBADD = $(PEPPER_X11_LIBS)
 
 libpepper_x11_la_SOURCES =  pepper-x11.h    \
                             x11-internal.h  \

diff --git a/src/samples/Makefile.am b/src/samples/Makefile.am
index 8cdfd6a..4c4f22a 100644 (file)
--- a/src/samples/Makefile.am
+++ b/src/samples/Makefile.am
@@ -3,45 +3,24 @@ noinst_PROGRAMS =
 # drm-backend
 noinst_PROGRAMS += drm-backend
 
-drm_backend_CFLAGS = $(WAYLAND_SERVER_CFLAGS)                   \
-                     $(PEPPER_INTERNAL_CFLAGS)                  \
-                     $(PEPPER_DRM_INTERNAL_CFLAGS)              \
-                     $(PEPPER_DESKTOP_SHELL_INTERNAL_CFLAGS)
-
-drm_backend_LDADD = $(WAYLAND_SERVER_LIBS)                      \
-                    $(PEPPER_INTERNAL_LIBS)                     \
-                    $(PEPPER_DRM_INTERNAL_LIBS)                 \
-                    $(PEPPER_DESKTOP_SHELL_INTERNAL_LIBS)
+drm_backend_CFLAGS = $(SAMPLES_CFLAGS)
+drm_backend_LDADD  = $(SAMPLES_LIBS)
 
 drm_backend_SOURCES = drm-backend.c
 
 # fbdev-backend
 noinst_PROGRAMS += fbdev-backend
 
-fbdev_backend_CFLAGS = $(WAYLAND_SERVER_CFLAGS)                 \
-                       $(PEPPER_INTERNAL_CFLAGS)                \
-                       $(PEPPER_FBDEV_INTERNAL_CFLAGS)          \
-                       $(PEPPER_DESKTOP_SHELL_INTERNAL_CFLAGS)
-
-fbdev_backend_LDADD = $(WAYLAND_SERVER_LIBS)                    \
-                      $(PEPPER_INTERNAL_LIBS)                   \
-                      $(PEPPER_FBDEV_INTERNAL_LIBS)             \
-                      $(PEPPER_DESKTOP_SHELL_INTERNAL_LIBS)
+fbdev_backend_CFLAGS = $(SAMPLES_CFLAGS)
+fbdev_backend_LDADD  = $(SAMPLES_LIBS)
 
 fbdev_backend_SOURCES = fbdev-backend.c
 
 # wayland-backend
 noinst_PROGRAMS += wayland-backend
 
-wayland_backend_CFLAGS = $(WAYLAND_SERVER_CFLAGS)               \
-                         $(PEPPER_INTERNAL_CFLAGS)              \
-                         $(PEPPER_WAYLAND_INTERNAL_CFLAGS)      \
-                         $(PEPPER_DESKTOP_SHELL_INTERNAL_CFLAGS)
-
-wayland_backend_LDADD = $(WAYLAND_SERVER_LIBS)                  \
-                        $(PEPPER_INTERNAL_LIBS)                 \
-                        $(PEPPER_WAYLAND_INTERNAL_LIBS)         \
-                        $(PEPPER_DESKTOP_SHELL_INTERNAL_LIBS)
+wayland_backend_CFLAGS = $(SAMPLES_CFLAGS)
+wayland_backend_LDADD  = $(SAMPLES_LIBS)
 
 wayland_backend_SOURCES = wayland-backend.c
 
@@ -49,15 +28,8 @@ wayland_backend_SOURCES = wayland-backend.c
 if ENABLE_X11
 noinst_PROGRAMS += x11-backend
 
-x11_backend_CFLAGS = $(WAYLAND_SERVER_CFLAGS)                   \
-                     $(PEPPER_INTERNAL_CFLAGS)                  \
-                     $(PEPPER_X11_INTERNAL_CFLAGS)              \
-                     $(PEPPER_DESKTOP_SHELL_INTERNAL_CFLAGS)
-
-x11_backend_LDADD = $(WAYLAND_SERVER_LIBS)                      \
-                    $(PEPPER_INTERNAL_LIBS)                     \
-                    $(PEPPER_X11_INTERNAL_LIBS)                 \
-                    $(PEPPER_DESKTOP_SHELL_INTERNAL_LIBS)
+x11_backend_CFLAGS = $(SAMPLES_CFLAGS)
+x11_backend_LDADD  = $(SAMPLES_LIBS)
 
 x11_backend_SOURCES = x11-backend.c
 endif
@@ -65,21 +37,15 @@ endif
 # simple-touch
 noinst_PROGRAMS += simple-touch
 
-simple_touch_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)  \
-                      $(PEPPER_INTERNAL_CFLAGS)
-
-simple_touch_LDADD = $(WAYLAND_CLIENT_LIBS)     \
-                     $(PEPPER_INTERNAL_LIBS)
+simple_touch_CFLAGS = $(SAMPLES_CFLAGS)
+simple_touch_LDADD  = $(SAMPLES_LIBS)
 
 simple_touch_SOURCES = simple-touch.c
 
 # simple-shm
 noinst_PROGRAMS += simple-shm
 
-simple_shm_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)    \
-                    $(PEPPER_INTERNAL_CFLAGS)
-
-simple_shm_LDADD = $(WAYLAND_CLIENT_LIBS)       \
-                   $(PEPPER_INTERNAL_LIBS)
+simple_shm_CFLAGS = $(SAMPLES_CFLAGS)
+simple_shm_LDADD  = $(SAMPLES_LIBS)
 
 simple_shm_SOURCES = simple-shm.c