From a6e60f1685b1b160fdae4ac721b0795e1af5ac1a Mon Sep 17 00:00:00 2001 From: Yuyeon Oh Date: Thu, 16 Jul 2015 18:43:22 +0900 Subject: [PATCH] build: autoconf all source tree at once Integrate all configure.ac files into one file in root directory. You can't use sub directories' configure file any more. TODO - enable or disable each sub module build separately ex) --enable-pepper-core Change-Id: I98c95563cc1fa2bcfbf9e4f902ac09a71505415d --- Makefile.am | 1 + src/lib/x11/autogen.sh => autogen.sh | 0 configure.ac | 127 +++++++++++++++++++++++++++++++++++ src/Makefile.am | 1 + src/bin/Makefile.am | 1 + src/bin/doctor/Makefile.am | 4 +- src/lib/Makefile.am | 1 + src/lib/desktop-shell/Makefile.am | 18 ++--- src/lib/desktop-shell/autogen.sh | 9 --- src/lib/desktop-shell/configure.ac | 41 ----------- src/lib/drm/Makefile.am | 10 ++- src/lib/drm/autogen.sh | 9 --- src/lib/drm/configure.ac | 35 ---------- src/lib/fbdev/Makefile.am | 11 ++- src/lib/fbdev/autogen.sh | 9 --- src/lib/fbdev/configure.ac | 35 ---------- src/lib/libinput/Makefile.am | 3 +- src/lib/libinput/autogen.sh | 9 --- src/lib/libinput/configure.ac | 34 ---------- src/lib/pepper/autogen.sh | 9 --- src/lib/pepper/configure.ac | 34 ---------- src/lib/pepper/packaging/pepper.spec | 35 ---------- src/lib/render/Makefile.am | 3 +- src/lib/render/autogen.sh | 9 --- src/lib/render/configure.ac | 58 ---------------- src/lib/wayland/Makefile.am | 9 ++- src/lib/wayland/autogen.sh | 9 --- src/lib/wayland/configure.ac | 33 --------- src/lib/x11/Makefile.am | 9 ++- src/lib/x11/configure.ac | 33 --------- src/samples/Makefile.am | 49 +++++++++++--- 31 files changed, 213 insertions(+), 435 deletions(-) create mode 100644 Makefile.am rename src/lib/x11/autogen.sh => autogen.sh (100%) create mode 100644 configure.ac create mode 100644 src/Makefile.am create mode 100644 src/bin/Makefile.am create mode 100644 src/lib/Makefile.am delete mode 100755 src/lib/desktop-shell/autogen.sh delete mode 100644 src/lib/desktop-shell/configure.ac delete mode 100755 src/lib/drm/autogen.sh delete mode 100644 src/lib/drm/configure.ac delete mode 100755 src/lib/fbdev/autogen.sh delete mode 100644 src/lib/fbdev/configure.ac delete mode 100755 src/lib/libinput/autogen.sh delete mode 100644 src/lib/libinput/configure.ac delete mode 100755 src/lib/pepper/autogen.sh delete mode 100644 src/lib/pepper/configure.ac delete mode 100644 src/lib/pepper/packaging/pepper.spec delete mode 100755 src/lib/render/autogen.sh delete mode 100644 src/lib/render/configure.ac delete mode 100755 src/lib/wayland/autogen.sh delete mode 100644 src/lib/wayland/configure.ac delete mode 100644 src/lib/x11/configure.ac diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..af437a6 --- /dev/null +++ b/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = src diff --git a/src/lib/x11/autogen.sh b/autogen.sh similarity index 100% rename from src/lib/x11/autogen.sh rename to autogen.sh diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..7480290 --- /dev/null +++ b/configure.ac @@ -0,0 +1,127 @@ +m4_define([pepper_major], 0) +m4_define([pepper_minor], 0) +m4_define([pepper_micro], 0) + +m4_define([pepper_version], [pepper_major.pepper_minor.pepper_micro]) + +AC_PREREQ([2.64]) +AC_INIT([pepper], [pepper_version], [tkq.kim@samsung.com]) + +AC_SUBST([PEPPER_VERSION_MAJOR], [pepper_major_version]) +AC_SUBST([PEPPER_VERSION_MINOR], [pepper_minor_version]) +AC_SUBST([PEPPER_VERSION_MICRO], [pepper_micro_version]) +AC_SUBST([PEPPER_VERSION], [pepper_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]) + +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]) + +# wayland-scanner +AC_PATH_PROG([wayland_scanner], [wayland-scanner]) +if test x$wayland_scanner = x; then + PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) + 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 +src/lib/render/Makefile +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 +]) + +AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..a5521a9 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = lib bin samples diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am new file mode 100644 index 0000000..ed86680 --- /dev/null +++ b/src/bin/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = doctor diff --git a/src/bin/doctor/Makefile.am b/src/bin/doctor/Makefile.am index 3d6da19..541d3d2 100644 --- a/src/bin/doctor/Makefile.am +++ b/src/bin/doctor/Makefile.am @@ -1,4 +1,4 @@ bin_PROGRAMS = doctor -doctor_CFLAGS = $(DOCTOR_CFLAGS) -Wall -doctor_LDADD = $(DOCTOR_LIBS) +doctor_CFLAGS = $(DOCTOR_CFLAGS) -Wall -I$(top_srcdir)/src/lib/pepper +doctor_LDADD = $(DOCTOR_LIBS) $(top_srcdir)/src/lib/pepper/libpepper.la doctor_SOURCES = server.c diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am new file mode 100644 index 0000000..8bba4db --- /dev/null +++ b/src/lib/Makefile.am @@ -0,0 +1 @@ +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 be9ffa7..cb3ef66 100644 --- a/src/lib/desktop-shell/Makefile.am +++ b/src/lib/desktop-shell/Makefile.am @@ -4,7 +4,9 @@ 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$(top_srcdir)/protocol/ +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 = \ @@ -12,23 +14,23 @@ libpepper_desktop_shell_la_SOURCES = \ shell.c \ shell-surface.c \ wl-shell.c \ - $(top_srcdir)/protocol/xdg-shell-protocol.c \ + $(srcdir)/protocol/xdg-shell-protocol.c \ xdg-shell.c # xdg-shell.xml xdg_shell_SOURCES = \ - $(top_srcdir)/protocol/xdg-shell-protocol.c \ - $(top_srcdir)/protocol/xdg-shell-server-protocol.h \ - $(top_srcdir)/protocol/xdg-shell-client-protocol.h + $(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) -$(top_srcdir)/protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml +$(srcdir)/protocol/%-protocol.c : $(srcdir)/protocol/%.xml $(AM_V_GEN)$(wayland_scanner) code < $< > $@ -$(top_srcdir)/protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml +$(srcdir)/protocol/%-server-protocol.h : $(srcdir)/protocol/%.xml $(AM_V_GEN)$(wayland_scanner) server-header < $< > $@ -$(top_srcdir)/protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml +$(srcdir)/protocol/%-client-protocol.h : $(srcdir)/protocol/%.xml $(AM_V_GEN)$(wayland_scanner) client-header < $< > $@ diff --git a/src/lib/desktop-shell/autogen.sh b/src/lib/desktop-shell/autogen.sh deleted file mode 100755 index 916169a..0000000 --- a/src/lib/desktop-shell/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. -( - cd "$srcdir" && - autoreconf --force -v --install -) || exit -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/src/lib/desktop-shell/configure.ac b/src/lib/desktop-shell/configure.ac deleted file mode 100644 index 81b4394..0000000 --- a/src/lib/desktop-shell/configure.ac +++ /dev/null @@ -1,41 +0,0 @@ -m4_define([pepper_desktop_shell_major], 0) -m4_define([pepper_desktop_shell_minor], 0) -m4_define([pepper_desktop_shell_micro], 0) - -m4_define([pepper_desktop_shell_version], - [pepper_desktop_shell_major.pepper_desktop_shell_minor.pepper_desktop_shell_micro]) - -AC_PREREQ([2.64]) -AC_INIT([pepper_desktop_shell], [pepper_desktop_shell_version], [tkq.kim@samsung.com]) - -AC_SUBST([PEPPER_DESKTOP_SHELL_VERSION_MAJOR], [pepper_desktop_shell_major_version]) -AC_SUBST([PEPPER_DESKTOP_SHELL_VERSION_MINOR], [pepper_desktop_shell_minor_version]) -AC_SUBST([PEPPER_DESKTOP_SHELL_VERSION_MICRO], [pepper_desktop_shell_micro_version]) -AC_SUBST([PEPPER_DESKTOP_SHELL_VERSION], [pepper_desktop_shell_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]) - -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]) - -# wayland-scanner -AC_PATH_PROG([wayland_scanner], [wayland-scanner]) -if test x$wayland_scanner = x; then - PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) - wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` -fi - -AC_CONFIG_FILES([ -Makefile -pepper-desktop-shell.pc -]) - -AC_OUTPUT diff --git a/src/lib/drm/Makefile.am b/src/lib/drm/Makefile.am index f9703e9..52d4968 100644 --- a/src/lib/drm/Makefile.am +++ b/src/lib/drm/Makefile.am @@ -4,8 +4,14 @@ include_HEADERS = pepper-drm.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pepper-drm.pc -libpepper_drm_la_CFLAGS = $(PEPPER_DRM_CFLAGS) -Wall -libpepper_drm_la_LIBADD = $(PEPPER_DRM_LIBS) +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 \ + $(top_srcdir)/src/lib/render/libpepper-render.la libpepper_drm_la_SOURCES = drm-internal.h \ drm-common.c \ diff --git a/src/lib/drm/autogen.sh b/src/lib/drm/autogen.sh deleted file mode 100755 index 916169a..0000000 --- a/src/lib/drm/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. -( - cd "$srcdir" && - autoreconf --force -v --install -) || exit -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/src/lib/drm/configure.ac b/src/lib/drm/configure.ac deleted file mode 100644 index 903591f..0000000 --- a/src/lib/drm/configure.ac +++ /dev/null @@ -1,35 +0,0 @@ -m4_define([pepper_drm_major], 0) -m4_define([pepper_drm_minor], 0) -m4_define([pepper_drm_micro], 0) - -m4_define([pepper_drm_version], [pepper_drm_major.pepper_drm_minor.pepper_drm_micro]) - -AC_PREREQ([2.64]) -AC_INIT([pepper_drm], [pepper_drm_version], [tkq.kim@samsung.com]) - -AC_SUBST([PEPPER_DRM_VERSION_MAJOR], [pepper_drm_major_version]) -AC_SUBST([PEPPER_DRM_VERSION_MINOR], [pepper_drm_minor_version]) -AC_SUBST([PEPPER_DRM_VERSION_MICRO], [pepper_drm_micro_version]) -AC_SUBST([PEPPER_DRM_VERSION], [pepper_drm_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]) - -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 -pepper-drm.pc -]) - -AC_OUTPUT diff --git a/src/lib/fbdev/Makefile.am b/src/lib/fbdev/Makefile.am index c774ad5..aa23734 100644 --- a/src/lib/fbdev/Makefile.am +++ b/src/lib/fbdev/Makefile.am @@ -4,9 +4,14 @@ include_HEADERS = pepper-fbdev.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pepper-fbdev.pc -libpepper_fbdev_la_CFLAGS = $(PEPPER_FBDEV_CFLAGS) -Wall -libpepper_fbdev_la_LIBADD = $(PEPPER_FBDEV_LIBS) - +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 \ + $(top_srcdir)/src/lib/render/libpepper-render.la libpepper_fbdev_la_SOURCES = fbdev-internal.h \ fbdev-common.c \ fbdev-output.c diff --git a/src/lib/fbdev/autogen.sh b/src/lib/fbdev/autogen.sh deleted file mode 100755 index 916169a..0000000 --- a/src/lib/fbdev/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. -( - cd "$srcdir" && - autoreconf --force -v --install -) || exit -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/src/lib/fbdev/configure.ac b/src/lib/fbdev/configure.ac deleted file mode 100644 index 229c103..0000000 --- a/src/lib/fbdev/configure.ac +++ /dev/null @@ -1,35 +0,0 @@ -m4_define([pepper_fbdev_major], 0) -m4_define([pepper_fbdev_minor], 0) -m4_define([pepper_fbdev_micro], 0) - -m4_define([pepper_fbdev_version], [pepper_fbdev_major.pepper_fbdev_minor.pepper_fbdev_micro]) - -AC_PREREQ([2.64]) -AC_INIT([pepper_fbdev], [pepper_fbdev_version], [tkq.kim@samsung.com]) - -AC_SUBST([PEPPER_FBDEV_VERSION_MAJOR], [pepper_fbdev_major_version]) -AC_SUBST([PEPPER_FBDEV_VERSION_MINOR], [pepper_fbdev_minor_version]) -AC_SUBST([PEPPER_FBDEV_VERSION_MICRO], [pepper_fbdev_micro_version]) -AC_SUBST([PEPPER_FBDEV_VERSION], [pepper_fbdev_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]) - -PEPPER_FBDEV_MODULES="pepper pepper-render pepper-libinput pixman-1 wayland-server \ - pepper-desktop-shell" - -PKG_CHECK_MODULES(PEPPER_FBDEV, [$PEPPER_FBDEV_MODULES]) -AC_SUBST([PEPPER_FBDEV_REQUIRES], [$PEPPER_FBDEV_MODULES]) - -AC_CONFIG_FILES([ -Makefile -pepper-fbdev.pc -]) - -AC_OUTPUT diff --git a/src/lib/libinput/Makefile.am b/src/lib/libinput/Makefile.am index 75605ff..68ccc4a 100644 --- a/src/lib/libinput/Makefile.am +++ b/src/lib/libinput/Makefile.am @@ -4,7 +4,8 @@ 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 = $(PEPPER_LIBINPUT_CFLAGS) -Wall \ + -I$(top_srcdir)/src/lib/pepper libpepper_libinput_la_LIBADD = $(PEPPER_LIBINPUT_LIBS) libpepper_libinput_la_SOURCES = libinput-internal.h \ diff --git a/src/lib/libinput/autogen.sh b/src/lib/libinput/autogen.sh deleted file mode 100755 index 916169a..0000000 --- a/src/lib/libinput/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. -( - cd "$srcdir" && - autoreconf --force -v --install -) || exit -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/src/lib/libinput/configure.ac b/src/lib/libinput/configure.ac deleted file mode 100644 index 174ccb5..0000000 --- a/src/lib/libinput/configure.ac +++ /dev/null @@ -1,34 +0,0 @@ -m4_define([pepper_libinput_major], 0) -m4_define([pepper_libinput_minor], 0) -m4_define([pepper_libinput_micro], 0) - -m4_define([pepper_libinput_version], - [pepper_libinput_major.pepper_libinput_minor.pepper_libinput_micro]) - -AC_PREREQ([2.64]) -AC_INIT([pepper_libinput], [pepper_libinput_version], [tkq.kim@samsung.com]) - -AC_SUBST([PEPPER_LIBINPUT_VERSION_MAJOR], [pepper_libinput_major_version]) -AC_SUBST([PEPPER_LIBINPUT_VERSION_MINOR], [pepper_libinput_minor_version]) -AC_SUBST([PEPPER_LIBINPUT_VERSION_MICRO], [pepper_libinput_micro_version]) -AC_SUBST([PEPPER_LIBINPUT_VERSION], [pepper_libinput_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]) - -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 -pepper-libinput.pc -]) - -AC_OUTPUT diff --git a/src/lib/pepper/autogen.sh b/src/lib/pepper/autogen.sh deleted file mode 100755 index 916169a..0000000 --- a/src/lib/pepper/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. -( - cd "$srcdir" && - autoreconf --force -v --install -) || exit -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/src/lib/pepper/configure.ac b/src/lib/pepper/configure.ac deleted file mode 100644 index b7b31ba..0000000 --- a/src/lib/pepper/configure.ac +++ /dev/null @@ -1,34 +0,0 @@ -m4_define([pepper_major], 0) -m4_define([pepper_minor], 0) -m4_define([pepper_micro], 0) - -m4_define([pepper_version], [pepper_major.pepper_minor.pepper_micro]) - -AC_PREREQ([2.64]) -AC_INIT([pepper], [pepper_version], [tkq.kim@samsung.com]) - -AC_SUBST([PEPPER_VERSION_MAJOR], [pepper_major_version]) -AC_SUBST([PEPPER_VERSION_MINOR], [pepper_minor_version]) -AC_SUBST([PEPPER_VERSION_MICRO], [pepper_micro_version]) -AC_SUBST([PEPPER_VERSION], [pepper_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]) - -PEPPER_MODULES="wayland-server pixman-1" -PKG_CHECK_MODULES(PEPPER, [$PEPPER_MODULES]) -AC_SUBST([PEPPER_REQUIRES], [$PEPPER_MODULES]) - -# Output files -AC_CONFIG_FILES([ -Makefile -pepper.pc -]) - -AC_OUTPUT diff --git a/src/lib/pepper/packaging/pepper.spec b/src/lib/pepper/packaging/pepper.spec deleted file mode 100644 index 518c1f7..0000000 --- a/src/lib/pepper/packaging/pepper.spec +++ /dev/null @@ -1,35 +0,0 @@ -Name: pepper -Version: 1.0.0 -Release: 0 -Summary: Pepper - Library for developing wayland compositor -License: Proprietary -Group: Graphics & UI Framework/Wayland Window System - -Source: %{name}-%{version}.tar.xz - -BuildRequires: autoconf > 2.64 -BuildRequires: automake >= 1.11 -BuildRequires: libtool >= 2.2 -BuildRequires: pkgconfig -BuildRequires: xz -BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(pixman-1) - -%description -Pepper is a lightweight and flexible library for developing various types of wayland compositors. - -%prep -%setup -q - -%build -%autogen - -make %{?_smp_mflags} - -%install -%make_install - -%files -%{_libdir}/libpepper.so* - -%post diff --git a/src/lib/render/Makefile.am b/src/lib/render/Makefile.am index 0246205..b5de41c 100644 --- a/src/lib/render/Makefile.am +++ b/src/lib/render/Makefile.am @@ -8,7 +8,8 @@ include_HEADERS += pepper-render.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pepper-render.pc -libpepper_render_la_CFLAGS = $(PEPPER_RENDER_CFLAGS) -Wall +libpepper_render_la_CFLAGS = $(PEPPER_RENDER_CFLAGS) -Wall \ + -I$(top_srcdir)/src/lib/pepper libpepper_render_la_LIBADD = $(PEPPER_RENDER_LIBS) libpepper_render_la_SOURCES = pepper-render.h \ diff --git a/src/lib/render/autogen.sh b/src/lib/render/autogen.sh deleted file mode 100755 index 916169a..0000000 --- a/src/lib/render/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. -( - cd "$srcdir" && - autoreconf --force -v --install -) || exit -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/src/lib/render/configure.ac b/src/lib/render/configure.ac deleted file mode 100644 index e3dbbdc..0000000 --- a/src/lib/render/configure.ac +++ /dev/null @@ -1,58 +0,0 @@ -m4_define([pepper_render_major], 0) -m4_define([pepper_render_minor], 0) -m4_define([pepper_render_micro], 0) - -m4_define([pepper_render_version], [pepper_render_major.pepper_render_minor.pepper_render_micro]) - -AC_PREREQ([2.64]) -AC_INIT([pepper_render], [pepper_render_version], [tkq.kim@samsung.com]) - -AC_SUBST([PEPPER_RENDER_VERSION_MAJOR], [pepper_render_major_version]) -AC_SUBST([PEPPER_RENDER_VERSION_MINOR], [pepper_render_minor_version]) -AC_SUBST([PEPPER_RENDER_VERSION_MICRO], [pepper_render_micro_version]) -AC_SUBST([PEPPER_RENDER_VERSION], [pepper_render_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]) - -PEPPER_RENDER_MODULES="pepper" - -# 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]) - -AC_CONFIG_FILES([ -Makefile -pepper-render.pc -]) - -AC_OUTPUT diff --git a/src/lib/wayland/Makefile.am b/src/lib/wayland/Makefile.am index a28eaed..ae8f0e5 100644 --- a/src/lib/wayland/Makefile.am +++ b/src/lib/wayland/Makefile.am @@ -4,9 +4,12 @@ include_HEADERS = pepper-wayland.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pepper-wayland.pc -libpepper_wayland_la_CFLAGS = $(PEPPER_WAYLAND_CFLAGS) -Wall -libpepper_wayland_la_LIBADD = $(PEPPER_WAYLAND_LIBS) - +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 \ + $(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/wayland/autogen.sh b/src/lib/wayland/autogen.sh deleted file mode 100755 index 916169a..0000000 --- a/src/lib/wayland/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. -( - cd "$srcdir" && - autoreconf --force -v --install -) || exit -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/src/lib/wayland/configure.ac b/src/lib/wayland/configure.ac deleted file mode 100644 index b992110..0000000 --- a/src/lib/wayland/configure.ac +++ /dev/null @@ -1,33 +0,0 @@ -m4_define([pepper_wayland_major], 0) -m4_define([pepper_wayland_minor], 0) -m4_define([pepper_wayland_micro], 0) - -m4_define([pepper_wayland_version], [pepper_wayland_major.pepper_wayland_minor.pepper_wayland_micro]) - -AC_PREREQ([2.64]) -AC_INIT([pepper_wayland], [pepper_wayland_version], [tkq.kim@samsung.com]) - -AC_SUBST([PEPPER_WAYLAND_VERSION_MAJOR], [pepper_wayland_major_version]) -AC_SUBST([PEPPER_WAYLAND_VERSION_MINOR], [pepper_wayland_minor_version]) -AC_SUBST([PEPPER_WAYLAND_VERSION_MICRO], [pepper_wayland_micro_version]) -AC_SUBST([PEPPER_WAYLAND_VERSION], [pepper_wayland_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]) - -PEPPER_WAYLAND_MODULES="pepper pepper-render wayland-server wayland-client pixman-1" -PKG_CHECK_MODULES(PEPPER_WAYLAND, [$PEPPER_WAYLAND_MODULES]) -AC_SUBST([PEPPER_WAYLAND_REQUIRES], [$PEPPER_WAYLAND_MODULES]) - -AC_CONFIG_FILES([ -Makefile -pepper-wayland.pc -]) - -AC_OUTPUT diff --git a/src/lib/x11/Makefile.am b/src/lib/x11/Makefile.am index 504bf37..513e57d 100644 --- a/src/lib/x11/Makefile.am +++ b/src/lib/x11/Makefile.am @@ -4,9 +4,12 @@ include_HEADERS = pepper-x11.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pepper-x11.pc -libpepper_x11_la_CFLAGS = $(PEPPER_X11_CFLAGS) -Wall -libpepper_x11_la_LIBADD = $(PEPPER_X11_LIBS) - +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 \ + $(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/lib/x11/configure.ac b/src/lib/x11/configure.ac deleted file mode 100644 index 6340f3e..0000000 --- a/src/lib/x11/configure.ac +++ /dev/null @@ -1,33 +0,0 @@ -m4_define([pepper_x11_major], 0) -m4_define([pepper_x11_minor], 0) -m4_define([pepper_x11_micro], 0) - -m4_define([pepper_x11_version], [pepper_x11_major.pepper_x11_minor.pepper_x11_micro]) - -AC_PREREQ([2.64]) -AC_INIT([pepper_x11], [pepper_x11_version], [tkq.kim@samsung.com]) - -AC_SUBST([PEPPER_X11_VERSION_MAJOR], [pepper_x11_major_version]) -AC_SUBST([PEPPER_X11_VERSION_MINOR], [pepper_x11_minor_version]) -AC_SUBST([PEPPER_X11_VERSION_MICRO], [pepper_x11_micro_version]) -AC_SUBST([PEPPER_X11_VERSION], [pepper_x11_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]) - -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 -pepper-x11.pc -]) - -AC_OUTPUT diff --git a/src/samples/Makefile.am b/src/samples/Makefile.am index 17f67d0..f380581 100644 --- a/src/samples/Makefile.am +++ b/src/samples/Makefile.am @@ -2,36 +2,63 @@ noinst_PROGRAMS = # drm-backend noinst_PROGRAMS += drm-backend -drm_backend_CFLAGS = $(DRM_BACKEND_CFLAGS) -drm_backend_LDADD = $(DRM_BACKEND_LIBS) +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_SOURCES = drm-backend.c # fbdev-backend noinst_PROGRAMS += fbdev-backend -fbdev_backend_CFLAGS = $(FBDEV_BACKEND_CFLAGS) -fbdev_backend_LDADD = $(FBDEV_BACKEND_LIBS) +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_SOURCES = fbdev-backend.c # wayland-backend noinst_PROGRAMS += wayland-backend -wayland_backend_CFLAGS = $(WAYLAND_BACKEND_CFLAGS) -wayland_backend_LDADD = $(WAYLAND_BACKEND_LIBS) +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_SOURCES = wayland-backend.c # x11-backend noinst_PROGRAMS += x11-backend -x11_backend_CFLAGS = $(X11_BACKEND_CFLAGS) -x11_backend_LDADD = $(X11_BACKEND_LIBS) +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_SOURCES = x11-backend.c # simple-touch noinst_PROGRAMS += simple-touch simple_touch_CFLAGS = $(SIMPLE_TOUCH_CFLAGS) -simple_touch_LDADD = $(SIMPLE_TOUCH_LIBS) +simple_touch_LDADD = $(SIMPLE_TOUCH_LIBS) \ + $(top_srcdir)/src/lib/pepper/libpepper.la simple_touch_SOURCES = simple-touch.c # simple-shm noinst_PROGRAMS += simple-shm -simple_shm_CFLAGS = $(SIMPLE_TOUCH_CFLAGS) -simple_shm_LDADD = $(SIMPLE_TOUCH_LIBS) +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_SOURCES = simple-shm.c -- 2.7.4