build: Fix build failure and some clean up

Change-Id: I133468f4897703ee62b6a5717cf38902804fb65b

diff --git a/src/lib/pepper/AUTHORS b/AUTHORS
similarity index 100%
rename from src/lib/pepper/AUTHORS
rename to AUTHORS

diff --git a/src/lib/pepper/CODING_STYLE b/CODING_STYLE
similarity index 100%
rename from src/lib/pepper/CODING_STYLE
rename to CODING_STYLE

diff --git a/src/lib/pepper/COPYING b/COPYING
similarity index 100%
rename from src/lib/pepper/COPYING
rename to COPYING

diff --git a/Makefile.am b/Makefile.am
index af437a6..7462dc4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,14 @@
 SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+
+pkgconfig_DATA =
+
+pkgconfig_DATA += pkgconfig/pepper.pc
+pkgconfig_DATA += pkgconfig/pepper-render.pc
+pkgconfig_DATA += pkgconfig/pepper-drm.pc
+pkgconfig_DATA += pkgconfig/pepper-fbdev.pc
+pkgconfig_DATA += pkgconfig/pepper-libinput.pc
+pkgconfig_DATA += pkgconfig/pepper-wayland.pc
+pkgconfig_DATA += pkgconfig/pepper-x11.pc
+pkgconfig_DATA += pkgconfig/pepper-desktop-shell.pc

diff --git a/src/lib/pepper/README b/README
similarity index 100%
rename from src/lib/pepper/README
rename to README

diff --git a/configure.ac b/configure.ac
index 7480290..d3f4ffe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,17 +21,15 @@ AC_PROG_CC
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-PEPPER_MODULES="wayland-server pixman-1"
-PKG_CHECK_MODULES(PEPPER, [$PEPPER_MODULES])
-AC_SUBST([PEPPER_REQUIRES], [$PEPPER_MODULES])
-
-PEPPER_LIBINPUT_MODULES="wayland-server libinput pixman-1"
-PKG_CHECK_MODULES(PEPPER_LIBINPUT, [$PEPPER_LIBINPUT_MODULES])
-AC_SUBST([PEPPER_LIBINPUT_REQUIRES], [$PEPPER_LIBINPUT_MODULES])
-
-PEPPER_DESKTOP_SHELL_MODULES="pixman-1"
-PKG_CHECK_MODULES(PEPPER_DESKTOP_SHELL, [$PEPPER_DESKTOP_SHELL_MODULES])
-AC_SUBST([PEPPER_DESKTOP_SHELL_REQUIRES], [$PEPPER_DESKTOP_SHELL_MODULES])
+PKG_CHECK_MODULES(WAYLAND_SERVER, "wayland-server")
+PKG_CHECK_MODULES(WAYLAND_CLIENT, "wayland-client")
+PKG_CHECK_MODULES(PIXMAN, "pixman-1")
+PKG_CHECK_MODULES(LIBINPUT, "libinput")
+PKG_CHECK_MODULES(LIBDRM, "libdrm")
+PKG_CHECK_MODULES(GBM, "gbm")
+PKG_CHECK_MODULES(X11, "x11 xcb-shm x11-xcb")
+PKG_CHECK_MODULES(EGL, "egl")
+PKG_CHECK_MODULES(GLESV2, "glesv2")
 
 # wayland-scanner
 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
@@ -40,77 +38,10 @@ if test x$wayland_scanner = x; then
     wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
 fi
 
-PEPPER_RENDER_MODULES=""
-
-# pixman renderer
-AC_ARG_ENABLE(pixman,
-              AC_HELP_STRING([--enable-pixman], [enable pixman renderer]),
-              [enable_pixman=$enableval], [enable_pixman=yes])
-
-AM_CONDITIONAL(ENABLE_PIXMAN, test $enable_pixman = yes)
-
-if test $enable_pixman = yes; then
-    AC_DEFINE(ENABLE_PIXMAN, 1, [Enable pixman renderer])
-    PEPPER_RENDER_MODULES="$PEPPER_RENDER_MODULES pixman-1"
-fi
-
-# gl renderer
-AC_ARG_ENABLE(gl,
-              AC_HELP_STRING([--enable-gl], [enable OpenGL renderer]),
-              [enable_gl=$enableval], [enable_gl=yes])
-
-AM_CONDITIONAL(ENABLE_GL, test $enable_gl = yes)
-
-if test $enable_gl = yes; then
-    AC_DEFINE(ENABLE_GL, 1, [Enable OpenGL renderer])
-    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])
-
-PEPPER_DRM_MODULES="pixman-1 wayland-server libdrm gbm"
-PKG_CHECK_MODULES(PEPPER_DRM, [$PEPPER_DRM_MODULES])
-AC_SUBST([PEPPER_DRM_REQUIRES], [$PEPPER_DRM_MODULES])
-
-PEPPER_X11_MODULES="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])
-
-PEPPER_FBDEV_MODULES="pixman-1 wayland-server"
-PKG_CHECK_MODULES(PEPPER_FBDEV, [$PEPPER_FBDEV_MODULES])
-AC_SUBST([PEPPER_FBDEV_REQUIRES], [$PEPPER_FBDEV_MODULES])
-
-PEPPER_WAYLAND_MODULES="wayland-server wayland-client pixman-1"
-PKG_CHECK_MODULES(PEPPER_WAYLAND, [$PEPPER_WAYLAND_MODULES])
-AC_SUBST([PEPPER_WAYLAND_REQUIRES], [$PEPPER_WAYLAND_MODULES])
-
-DOCTOR_MODULES="wayland-server pixman-1"
-PKG_CHECK_MODULES(DOCTOR, [$DOCTOR_MODULES])
-
-DRM_BACKEND_MODULES="pixman-1 wayland-server"
-PKG_CHECK_MODULES(DRM_BACKEND, [$DRM_BACKEND_MODULES])
-
-FBDEV_BACKEND_MODULES="pixman-1 wayland-server"
-PKG_CHECK_MODULES(FBDEV_BACKEND, [$FBDEV_BACKEND_MODULES])
-
-WAYLAND_BACKEND_MODULES="pixman-1 wayland-server"
-PKG_CHECK_MODULES(WAYLAND_BACKEND, [$WAYLAND_BACKEND_MODULES])
-
-X11_BACKEND_MODULES="pixman-1 wayland-server"
-PKG_CHECK_MODULES(X11_BACKEND, [$X11_BACKEND_MODULES])
-
-SIMPLE_TOUCH_MODULES="wayland-client"
-PKG_CHECK_MODULES(SIMPLE_TOUCH, [$SIMPLE_TOUCH_MODULES])
-
-SIMPLE_SHM_MODULES="pixman-1 wayland-client"
-PKG_CHECK_MODULES(SIMPLE_SHM, [$SIMPLE_SHM_MODULES])
-
 # Output files
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-src/lib/Makefile
 src/lib/pepper/Makefile
 src/lib/libinput/Makefile
 src/lib/desktop-shell/Makefile
@@ -119,9 +50,16 @@ src/lib/drm/Makefile
 src/lib/x11/Makefile
 src/lib/fbdev/Makefile
 src/lib/wayland/Makefile
-src/bin/Makefile
 src/bin/doctor/Makefile
 src/samples/Makefile
+pkgconfig/pepper.pc
+pkgconfig/pepper-render.pc
+pkgconfig/pepper-drm.pc
+pkgconfig/pepper-fbdev.pc
+pkgconfig/pepper-libinput.pc
+pkgconfig/pepper-wayland.pc
+pkgconfig/pepper-x11.pc
+pkgconfig/pepper-desktop-shell.pc
 ])
 
 AC_OUTPUT

diff --git a/src/lib/desktop-shell/pepper-desktop-shell.pc.in b/pkgconfig/pepper-desktop-shell.pc.in
similarity index 100%
rename from src/lib/desktop-shell/pepper-desktop-shell.pc.in
rename to pkgconfig/pepper-desktop-shell.pc.in

diff --git a/src/lib/drm/pepper-drm.pc.in b/pkgconfig/pepper-drm.pc.in
similarity index 100%
rename from src/lib/drm/pepper-drm.pc.in
rename to pkgconfig/pepper-drm.pc.in

diff --git a/src/lib/fbdev/pepper-fbdev.pc.in b/pkgconfig/pepper-fbdev.pc.in
similarity index 100%
rename from src/lib/fbdev/pepper-fbdev.pc.in
rename to pkgconfig/pepper-fbdev.pc.in

diff --git a/src/lib/libinput/pepper-libinput.pc.in b/pkgconfig/pepper-libinput.pc.in
similarity index 100%
rename from src/lib/libinput/pepper-libinput.pc.in
rename to pkgconfig/pepper-libinput.pc.in

diff --git a/src/lib/render/pepper-render.pc.in b/pkgconfig/pepper-render.pc.in
similarity index 100%
rename from src/lib/render/pepper-render.pc.in
rename to pkgconfig/pepper-render.pc.in

diff --git a/src/lib/wayland/pepper-wayland.pc.in b/pkgconfig/pepper-wayland.pc.in
similarity index 100%
rename from src/lib/wayland/pepper-wayland.pc.in
rename to pkgconfig/pepper-wayland.pc.in

diff --git a/src/lib/x11/pepper-x11.pc.in b/pkgconfig/pepper-x11.pc.in
similarity index 100%
rename from src/lib/x11/pepper-x11.pc.in
rename to pkgconfig/pepper-x11.pc.in

diff --git a/src/lib/pepper/pepper.pc.in b/pkgconfig/pepper.pc.in
similarity index 100%
rename from src/lib/pepper/pepper.pc.in
rename to pkgconfig/pepper.pc.in

diff --git a/src/Makefile.am b/src/Makefile.am
index a5521a9..66d92aa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,10 @@
-SUBDIRS = lib bin samples
+SUBDIRS = lib/pepper        \
+          lib/libinput      \
+          lib/desktop-shell \
+          lib/render        \
+          lib/drm           \
+          lib/fbdev         \
+          lib/wayland       \
+          lib/x11           \
+          samples           \
+          bin/doctor

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
deleted file mode 100644 (file)
index ed86680..0000000
--- a/src/bin/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = doctor

diff --git a/src/bin/doctor/Makefile.am b/src/bin/doctor/Makefile.am
index 541d3d2..796f0dc 100644 (file)
--- a/src/bin/doctor/Makefile.am
+++ b/src/bin/doctor/Makefile.am
@@ -1,4 +1,4 @@
 bin_PROGRAMS = doctor
-doctor_CFLAGS = $(DOCTOR_CFLAGS) -Wall -I$(top_srcdir)/src/lib/pepper
-doctor_LDADD = $(DOCTOR_LIBS) $(top_srcdir)/src/lib/pepper/libpepper.la
+doctor_CFLAGS = -I$(top_srcdir)/src/lib/pepper $(PIXMAN_CFLAGS) $(WAYLAND_SERVER_CFLAGS)
+doctor_LDADD = $(top_srcdir)/src/lib/pepper/libpepper.la $(WAYLAND_SERVER_LIBS)
 doctor_SOURCES = server.c

diff --git a/src/bin/doctor/configure.ac b/src/bin/doctor/configure.ac
deleted file mode 100644 (file)
index 510cd7d..0000000
--- a/src/bin/doctor/configure.ac
+++ /dev/null
@@ -1,32 +0,0 @@
-m4_define([doctor_major], 0)
-m4_define([doctor_minor], 0)
-m4_define([doctor_micro], 0)
-
-m4_define([doctor_version], [doctor_major.doctor_minor.doctor_micro])
-
-AC_PREREQ([2.64])
-AC_INIT([doctor], [doctor_version], [tkq.kim@samsung.com])
-
-AC_SUBST([DOCTOR_VERSION_MAJOR], [doctor_major_version])
-AC_SUBST([DOCTOR_VERSION_MINOR], [doctor_minor_version])
-AC_SUBST([DOCTOR_VERSION_MICRO], [doctor_micro_version])
-AC_SUBST([DOCTOR_VERSION], [doctor_version])
-
-AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-LT_PREREQ([2.2])
-LT_INIT([disable-static])
-
-DOCTOR_MODULES="wayland-server pepper"
-
-PKG_CHECK_MODULES(DOCTOR, [$DOCTOR_MODULES])
-
-AC_CONFIG_FILES([
-Makefile
-])
-
-AC_OUTPUT

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
deleted file mode 100644 (file)
index 8bba4db..0000000
--- a/src/lib/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = pepper libinput desktop-shell render drm x11 fbdev wayland

diff --git a/src/lib/desktop-shell/Makefile.am b/src/lib/desktop-shell/Makefile.am
index cb3ef66..bba9c89 100644 (file)
--- a/src/lib/desktop-shell/Makefile.am
+++ b/src/lib/desktop-shell/Makefile.am
@@ -1,27 +1,24 @@
 lib_LTLIBRARIES = libpepper-desktop-shell.la
 include_HEADERS = pepper-desktop-shell.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pepper-desktop-shell.pc
-
-libpepper_desktop_shell_la_CFLAGS = $(PEPPER_DESKTOP_SHELL_CFLAGS) -Wall \
-                                    -I$(srcdir)/protocol/                \
-                                    -I$(top_srcdir)/src/lib/pepper 
-libpepper_desktop_shell_la_LIBADD = $(PEPPER_DESKTOP_SHELL_LIBS)
-
-libpepper_desktop_shell_la_SOURCES =            \
-        desktop-shell-internal.h  \
-        shell.c                   \
-        shell-surface.c           \
-        wl-shell.c                \
-        $(srcdir)/protocol/xdg-shell-protocol.c             \
-        xdg-shell.c
+libpepper_desktop_shell_la_CFLAGS = -I$(srcdir)/protocol/           \
+                                    -I$(top_srcdir)/src/lib/pepper  \
+                                    $(PIXMAN_CFLAGS)                \
+                                    $(WAYLAND_SERVER_CFLAGS)
+
+libpepper_desktop_shell_la_LIBADD = $(top_srcdir)/src/lib/pepper/libpepper.la
+
+libpepper_desktop_shell_la_SOURCES = desktop-shell-internal.h                   \
+                                     shell.c                                    \
+                                     shell-surface.c                            \
+                                     wl-shell.c                                 \
+                                     $(srcdir)/protocol/xdg-shell-protocol.c    \
+                                     xdg-shell.c
 
 # xdg-shell.xml
-xdg_shell_SOURCES  =                       \
-        $(srcdir)/protocol/xdg-shell-protocol.c             \
-        $(srcdir)/protocol/xdg-shell-server-protocol.h      \
-        $(srcdir)/protocol/xdg-shell-client-protocol.h
+xdg_shell_SOURCES  = $(srcdir)/protocol/xdg-shell-protocol.c        \
+                     $(srcdir)/protocol/xdg-shell-server-protocol.h \
+                     $(srcdir)/protocol/xdg-shell-client-protocol.h
 
 BUILT_SOURCES = $(xdg_shell_SOURCES)
 CLEANFILES = $(xdg_shell_SOURCES)

diff --git a/src/lib/drm/Makefile.am b/src/lib/drm/Makefile.am
index 52d4968..932f15a 100644 (file)
--- a/src/lib/drm/Makefile.am
+++ b/src/lib/drm/Makefile.am
@@ -1,18 +1,17 @@
 lib_LTLIBRARIES = libpepper-drm.la
 include_HEADERS = pepper-drm.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pepper-drm.pc
+libpepper_drm_la_CFLAGS = $(LIBDRM_CFLAGS)                  \
+                          -I$(top_srcdir)/src/lib/pepper    \
+                          -I$(top_srcdir)/src/lib/libinput  \
+                          -I$(top_srcdir)/src/lib/render    \
+                          $(PIXMAN_CFLAGS)
 
-libpepper_drm_la_CFLAGS = $(PEPPER_DRM_CFLAGS) -Wall       \
-                          -I$(top_srcdir)/src/lib/pepper   \
-                          -I$(top_srcdir)/src/lib/libinput \
-                          -I$(top_srcdir)/src/lib/render 
-libpepper_drm_la_LIBADD = $(PEPPER_DRM_LIBS)                                   \
-                          $(top_srcdir)/src/lib/pepper/libpepper.la            \
-                          $(top_srcdir)/src/lib/libinput/libpepper-libinput.la \
+libpepper_drm_la_LIBADD = $(LIBDRM_LIBS)                                        \
+                          $(top_srcdir)/src/lib/pepper/libpepper.la             \
+                          $(top_srcdir)/src/lib/libinput/libpepper-libinput.la  \
                           $(top_srcdir)/src/lib/render/libpepper-render.la
 
-libpepper_drm_la_SOURCES =  drm-internal.h      \
-                            drm-common.c        \
+libpepper_drm_la_SOURCES =  drm-internal.h  \
+                            drm-common.c    \
                             drm-output.c

diff --git a/src/lib/fbdev/Makefile.am b/src/lib/fbdev/Makefile.am
index aa23734..4d633c3 100644 (file)
--- a/src/lib/fbdev/Makefile.am
+++ b/src/lib/fbdev/Makefile.am
@@ -1,17 +1,16 @@
 lib_LTLIBRARIES = libpepper-fbdev.la
 include_HEADERS = pepper-fbdev.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pepper-fbdev.pc
+libpepper_fbdev_la_CFLAGS = -I$(top_srcdir)/src/lib/pepper      \
+                            -I$(top_srcdir)/src/lib/libinput    \
+                            -I$(top_srcdir)/src/lib/render      \
+                            $(PIXMAN_CFLAGS)                    \
+                            $(WAYLAND_SERVER_CFLAGS)
 
-libpepper_fbdev_la_CFLAGS = $(PEPPER_FBDEV_CFLAGS) -Wall     \
-                            -I$(top_srcdir)/src/lib/pepper   \
-                            -I$(top_srcdir)/src/lib/libinput \
-                            -I$(top_srcdir)/src/lib/render
-libpepper_fbdev_la_LIBADD = $(PEPPER_FBDEV_LIBS)                                 \
-                            $(top_srcdir)/src/lib/pepper/libpepper.la            \
-                            $(top_srcdir)/src/lib/libinput/libpepper-libinput.la \
+libpepper_fbdev_la_LIBADD = $(top_srcdir)/src/lib/pepper/libpepper.la               \
+                            $(top_srcdir)/src/lib/libinput/libpepper-libinput.la    \
                             $(top_srcdir)/src/lib/render/libpepper-render.la
-libpepper_fbdev_la_SOURCES = fbdev-internal.h      \
-                             fbdev-common.c        \
+
+libpepper_fbdev_la_SOURCES = fbdev-internal.h   \
+                             fbdev-common.c     \
                              fbdev-output.c

diff --git a/src/lib/libinput/Makefile.am b/src/lib/libinput/Makefile.am
index 68ccc4a..e3f774e 100644 (file)
--- a/src/lib/libinput/Makefile.am
+++ b/src/lib/libinput/Makefile.am
@@ -1,12 +1,11 @@
 lib_LTLIBRARIES = libpepper-libinput.la
 include_HEADERS = pepper-libinput.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pepper-libinput.pc
-
-libpepper_libinput_la_CFLAGS = $(PEPPER_LIBINPUT_CFLAGS) -Wall \
+libpepper_libinput_la_CFLAGS = $(LIBINPUT_CFLAGS)               \
+                               $(PIXMAN_CFLAGS)                 \
                                -I$(top_srcdir)/src/lib/pepper
-libpepper_libinput_la_LIBADD = $(PEPPER_LIBINPUT_LIBS)
 
-libpepper_libinput_la_SOURCES = libinput-internal.h      \
+libpepper_libinput_la_LIBADD = $(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 1218830..923e1c9 100644 (file)
--- a/src/lib/pepper/Makefile.am
+++ b/src/lib/pepper/Makefile.am
@@ -1,11 +1,8 @@
 lib_LTLIBRARIES = libpepper.la
 include_HEADERS = pepper.h pepper-utils.h pepper-output-backend.h pepper-input-backend.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pepper.pc
-
-libpepper_la_CFLAGS = $(PEPPER_CFLAGS) -Wall
-libpepper_la_LIBADD = $(PEPPER_LIBS) -lm
+libpepper_la_CFLAGS = $(WAYLAND_SERVER_CFLAGS) $(PIXMAN_CFLAGS)
+libpepper_la_LIBADD = $(WAYLAND_SERVER_LIBS) $(PIXMAN_LIBS) -lm
 
 libpepper_la_SOURCES = pepper.h                 \
                        pepper-internal.h        \

diff --git a/src/lib/render/Makefile.am b/src/lib/render/Makefile.am
index b5de41c..84bd7b2 100644 (file)
--- a/src/lib/render/Makefile.am
+++ b/src/lib/render/Makefile.am
@@ -5,34 +5,27 @@ include_HEADERS =
 lib_LTLIBRARIES += libpepper-render.la
 include_HEADERS += pepper-render.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pepper-render.pc
+libpepper_render_la_CFLAGS = -I$(top_srcdir)/src/lib/pepper
 
-libpepper_render_la_CFLAGS = $(PEPPER_RENDER_CFLAGS) -Wall \
-                             -I$(top_srcdir)/src/lib/pepper
-libpepper_render_la_LIBADD = $(PEPPER_RENDER_LIBS)
+libpepper_render_la_LIBADD = $(top_srcdir)/src/lib/pepper/libpepper.la
 
-libpepper_render_la_SOURCES = pepper-render.h          \
-                             pepper-render-internal.h  \
+libpepper_render_la_SOURCES = pepper-render.h           \
+                             pepper-render-internal.h  \
                              renderer.c
 
 # pixman renderer
-if ENABLE_PIXMAN
 include_HEADERS += pepper-pixman-renderer.h
 
 libpepper_render_la_CFLAGS += $(PIXMAN_CFLAGS)
 libpepper_render_la_LIBADD += $(PIXMAN_LIBS)
 
 libpepper_render_la_SOURCES += pixman-renderer.c
-endif
 
 # gl renderer
-if ENABLE_GL
 include_HEADERS += pepper-gl-renderer.h
 
-libpepper_render_la_CFLAGS += $(GL_CFLAGS)
-libpepper_render_la_LIBADD += $(GL_LIBS)
+libpepper_render_la_CFLAGS += $(EGL_CFLAGS) $(GLESV2_CLFAGS)
+libpepper_render_la_LIBADD += $(EGL_LIBS) $(GLESV2_LIBS)
 
 libpepper_render_la_SOURCES += gl-renderer.c    \
                                eglextwayland.h
-endif

diff --git a/src/lib/wayland/Makefile.am b/src/lib/wayland/Makefile.am
index ae8f0e5..f39f214 100644 (file)
--- a/src/lib/wayland/Makefile.am
+++ b/src/lib/wayland/Makefile.am
@@ -1,15 +1,15 @@
 lib_LTLIBRARIES = libpepper-wayland.la
 include_HEADERS = pepper-wayland.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pepper-wayland.pc
+libpepper_wayland_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)          \
+                              -I$(top_srcdir)/src/lib/pepper    \
+                              -I$(top_srcdir)/src/lib/render    \
+                              $(PIXMAN_CFLAGS)
 
-libpepper_wayland_la_CFLAGS = $(PEPPER_WAYLAND_CFLAGS) -Wall \
-                              -I$(top_srcdir)/src/lib/pepper \
-                              -I$(top_srcdir)/src/lib/render
-libpepper_wayland_la_LIBADD = $(PEPPER_WAYLAND_LIBS)                    \
-                              $(top_srcdir)/src/lib/pepper/libpepper.la \
+libpepper_wayland_la_LIBADD = $(WAYLAND_CLIENT_LIBS)                            \
+                              $(top_srcdir)/src/lib/pepper/libpepper.la         \
                               $(top_srcdir)/src/lib/render/libpepper-render.la
+
 libpepper_wayland_la_SOURCES =  pepper-wayland.h        \
                                 wayland-internal.h      \
                                 wayland-common.c        \

diff --git a/src/lib/x11/Makefile.am b/src/lib/x11/Makefile.am
index 513e57d..cc78f89 100644 (file)
--- a/src/lib/x11/Makefile.am
+++ b/src/lib/x11/Makefile.am
@@ -1,15 +1,15 @@
 lib_LTLIBRARIES = libpepper-x11.la
 include_HEADERS = pepper-x11.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pepper-x11.pc
+libpepper_x11_la_CFLAGS = $(X11_CFLAGS)                     \
+                          -I$(top_srcdir)/src/lib/pepper    \
+                          -I$(top_srcdir)/src/lib/render    \
+                          $(PIXMAN_CFLAGS)
 
-libpepper_x11_la_CFLAGS = $(PEPPER_X11_CFLAGS) -Wall     \
-                          -I$(top_srcdir)/src/lib/pepper \
-                          -I$(top_srcdir)/src/lib/render
-libpepper_x11_la_LIBADD = $(PEPPER_X11_LIBS)                        \
-                          $(top_srcdir)/src/lib/pepper/libpepper.la \
+libpepper_x11_la_LIBADD = $(X11_LIBS)                                       \
+                          $(top_srcdir)/src/lib/pepper/libpepper.la         \
                           $(top_srcdir)/src/lib/render/libpepper-render.la
+
 libpepper_x11_la_SOURCES =  pepper-x11.h    \
                             x11-internal.h  \
                             x11-common.c    \

diff --git a/src/samples/Makefile.am b/src/samples/Makefile.am
index f380581..3600f0a 100644 (file)
--- a/src/samples/Makefile.am
+++ b/src/samples/Makefile.am
@@ -2,63 +2,88 @@ noinst_PROGRAMS =
 
 # drm-backend
 noinst_PROGRAMS += drm-backend
-drm_backend_CFLAGS = $(DRM_BACKEND_CFLAGS)          \
-                     -I$(top_srcdir)/src/lib/pepper \
-                     -I$(top_srcdir)/src/lib/drm    \
-                     -I$(top_srcdir)/src/lib/desktop-shell
-drm_backend_LDADD = $(DRM_BACKEND_LIBS)                        \
-                    $(top_srcdir)/src/lib/pepper/libpepper.la  \
-                    $(top_srcdir)/src/lib/drm/libpepper-drm.la \
-                    $(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la
+
+drm_backend_CFLAGS = -I$(top_srcdir)/src/lib/pepper         \
+                     -I$(top_srcdir)/src/lib/drm            \
+                     -I$(top_srcdir)/src/lib/desktop-shell  \
+                     $(PIXMAN_CFLAGS)                       \
+                     $(WAYLAND_SERVER_CFLAGS)
+
+drm_backend_LDADD = $(top_srcdir)/src/lib/pepper/libpepper.la                       \
+                    $(top_srcdir)/src/lib/drm/libpepper-drm.la                      \
+                    $(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la  \
+                    $(WAYLAND_SERVER_LIBS)
+
 drm_backend_SOURCES = drm-backend.c
 
 # fbdev-backend
 noinst_PROGRAMS += fbdev-backend
-fbdev_backend_CFLAGS = $(FBDEV_BACKEND_CFLAGS)        \
-                       -I$(top_srcdir)/src/lib/pepper \
-                       -I$(top_srcdir)/src/lib/fbdev  \
-                       -I$(top_srcdir)/src/lib/desktop-shell
-fbdev_backend_LDADD = $(FBDEV_BACKEND_LIBS)                          \
-                      $(top_srcdir)/src/lib/pepper/libpepper.la      \
-                      $(top_srcdir)/src/lib/fbdev/libpepper-fbdev.la \
-                      $(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la
+
+fbdev_backend_CFLAGS = -I$(top_srcdir)/src/lib/pepper           \
+                       -I$(top_srcdir)/src/lib/fbdev            \
+                       -I$(top_srcdir)/src/lib/desktop-shell    \
+                       $(PIXMAN_CFLAGS)                         \
+                       $(WAYLAND_SERVER_CFLAGS)
+
+fbdev_backend_LDADD = $(top_srcdir)/src/lib/pepper/libpepper.la                         \
+                      $(top_srcdir)/src/lib/fbdev/libpepper-fbdev.la                    \
+                      $(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la    \
+                      $(WAYLAND_SERVER_LIBS)
+
 fbdev_backend_SOURCES = fbdev-backend.c
 
 # wayland-backend
 noinst_PROGRAMS += wayland-backend
-wayland_backend_CFLAGS = $(WAYLAND_BACKEND_CFLAGS)       \
-                         -I$(top_srcdir)/src/lib/pepper  \
-                         -I$(top_srcdir)/src/lib/wayland \
-                         -I$(top_srcdir)/src/lib/desktop-shell
-wayland_backend_LDADD = $(WAYLAND_BACKEND_LIBS)                            \
-                        $(top_srcdir)/src/lib/pepper/libpepper.la          \
-                        $(top_srcdir)/src/lib/wayland/libpepper-wayland.la \
-                        $(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la
+
+wayland_backend_CFLAGS = -I$(top_srcdir)/src/lib/pepper         \
+                         -I$(top_srcdir)/src/lib/wayland        \
+                         -I$(top_srcdir)/src/lib/desktop-shell  \
+                         $(PIXMAN_CFLAGS)                       \
+                         $(WAYLAND_SERVER_CFLAGS)
+
+wayland_backend_LDADD = $(top_srcdir)/src/lib/pepper/libpepper.la                       \
+                        $(top_srcdir)/src/lib/wayland/libpepper-wayland.la              \
+                        $(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la  \
+                        $(WAYLAND_SERVER_LIBS)
+
 wayland_backend_SOURCES = wayland-backend.c
 
 # x11-backend
 noinst_PROGRAMS += x11-backend
-x11_backend_CFLAGS = $(X11_BACKEND_CFLAGS)          \
-                     -I$(top_srcdir)/src/lib/pepper \
-                     -I$(top_srcdir)/src/lib/x11    \
-                     -I$(top_srcdir)/src/lib/desktop-shell
-x11_backend_LDADD = $(X11_BACKEND_LIBS)                        \
-                    $(top_srcdir)/src/lib/pepper/libpepper.la  \
-                    $(top_srcdir)/src/lib/x11/libpepper-x11.la \
-                    $(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la
+
+x11_backend_CFLAGS = -I$(top_srcdir)/src/lib/pepper         \
+                     -I$(top_srcdir)/src/lib/x11            \
+                     -I$(top_srcdir)/src/lib/desktop-shell  \
+                     $(PIXMAN_CFLAGS)                       \
+                     $(WAYLAND_SERVER_CFLAGS)
+
+x11_backend_LDADD = $(top_srcdir)/src/lib/pepper/libpepper.la                       \
+                    $(top_srcdir)/src/lib/x11/libpepper-x11.la                      \
+                    $(top_srcdir)/src/lib/desktop-shell/libpepper-desktop-shell.la  \
+                    $(WAYLAND_SERVER_LIBS)
+
 x11_backend_SOURCES = x11-backend.c
 
 # simple-touch
 noinst_PROGRAMS += simple-touch
-simple_touch_CFLAGS = $(SIMPLE_TOUCH_CFLAGS)
-simple_touch_LDADD = $(SIMPLE_TOUCH_LIBS) \
+
+simple_touch_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)      \
+                      -I$(top_srcdir)/src/lib/pepper  \
+                      $(PIXMAN_CFLAGS)
+
+simple_touch_LDADD = $(WAYLAND_CLIENT_LIBS)                     \
                      $(top_srcdir)/src/lib/pepper/libpepper.la
+
 simple_touch_SOURCES = simple-touch.c
 
 # simple-shm
 noinst_PROGRAMS += simple-shm
-simple_shm_CFLAGS = $(SIMPLE_SHM_CFLAGS) \
-                    -I$(top_srcdir)/src/lib/pepper
-simple_shm_LDADD = $(SIMPLE_SHM_LIBS) \
-                   $(top_srcdir)/src/lib/pepper/libpepper.la
+
+simple_shm_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)        \
+                    -I$(top_srcdir)/src/lib/pepper    \
+                    $(PIXMAN_CFLAGS)
+
+simple_shm_LDADD = $(WAYLAND_CLIENT_LIBS)                       \
+                     $(top_srcdir)/src/lib/pepper/libpepper.la
+
 simple_shm_SOURCES = simple-shm.c

diff --git a/src/samples/configure.ac b/src/samples/configure.ac
deleted file mode 100644 (file)
index 75d0a30..0000000
--- a/src/samples/configure.ac
+++ /dev/null
@@ -1,54 +0,0 @@
-m4_define([pepper_samples_major], 0)
-m4_define([pepper_samples_minor], 0)
-m4_define([pepper_samples_micro], 0)
-
-m4_define([pepper_samples_version], [pepper_samples_major.pepper_samples_minor.pepper_samples_micro])
-
-AC_PREREQ([2.64])
-AC_INIT([pepper_samples], [pepper_samples_version], [tkq.kim@samsung.com])
-
-AC_SUBST([PEPPER_SAMPLES_VERSION_MAJOR], [pepper_samples_major_version])
-AC_SUBST([PEPPER_SAMPLES_VERSION_MINOR], [pepper_samples_minor_version])
-AC_SUBST([PEPPER_SAMPLES_VERSION_MICRO], [pepper_samples_micro_version])
-AC_SUBST([PEPPER_SAMPLES_VERSION], [pepper_samples_version])
-
-AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-LT_PREREQ([2.2])
-LT_INIT([disable-static])
-
-# drm-backend
-PKG_CHECK_MODULES(DRM_BACKEND,
-                  [wayland-server pepper pepper-render
-                   pepper-drm pepper-libinput
-                   pepper-desktop-shell])
-
-# fbdev-backend
-PKG_CHECK_MODULES(FBDEV_BACKEND,
-                  [wayland-server pepper pepper-render
-                   pepper-fbdev pepper-libinput
-                   pepper-desktop-shell])
-
-# wayland-backend
-PKG_CHECK_MODULES(WAYLAND_BACKEND,
-                  [wayland-server pepper pepper-render pepper-wayland pepper-desktop-shell])
-
-# x11-backend
-PKG_CHECK_MODULES(X11_BACKEND,
-                  [wayland-server pepper pepper-render pepper-x11 pepper-desktop-shell])
-
-# simple-touch
-PKG_CHECK_MODULES(SIMPLE_TOUCH, [wayland-client pepper])
-
-# simple-shm
-PKG_CHECK_MODULES(SIMPLE_SHM, [wayland-client pepper])
-
-AC_CONFIG_FILES([
-Makefile
-])
-
-AC_OUTPUT

diff --git a/src/samples/simple-touch.c b/src/samples/simple-touch.c
index 50b6d4d..aa1dd4d 100644 (file)
--- a/src/samples/simple-touch.c
+++ b/src/samples/simple-touch.c
@@ -32,6 +32,7 @@
 #include <sys/mman.h>
 
 #include <wayland-client.h>
+#include <pepper-utils.h>
 
 #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])