Thanks. Your patch lets me build successfully. I can't install wayland development packages on ubuntu 11.10 due to package conflicts, so there's no alternative for me here.
I'm not sure about the tarball case. Perhaps you could disable/fail tarball creation when these macros are missing. But for the time being, please commit your patch as is. Jose ----- Original Message ----- > Sorry, guys. > > The wayland macros is missing, but i'm not sure how to properly solve > this. > We could use m4_ifdef to include it only when wayland is actually > available, > but that will require that the packager has it available when > creating > the tarballs. > > Attaching a patch for that, have you got better ideas? > > 2012/1/26 Stéphane Marchesin <stephane.marche...@gmail.com>: > > Fails here too (fedora 15). > > > > Stéphane > > > > > > On Thu, Jan 26, 2012 at 01:35, Jose Fonseca <jfons...@vmware.com> > > wrote: > >> Benjamin, > >> > >> I'm getting build failures with your commit: > >> > >> + ./autogen.sh --prefix=/usr --enable-gles1 --enable-gles2 > >> --enable-openvg --enable-xorg --enable-xa --disable-glut > >> --enable-gallium-egl --enable-gallium-llvm > >> --with-dri-drivers=swrast > >> --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast > >> autoreconf: Entering directory `.' > >> autoreconf: configure.ac: not using Gettext > >> autoreconf: running: aclocal > >> configure.ac:15: warning: AC_INIT: not a literal: > >> https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa > >> autoreconf: configure.ac: tracing > >> configure.ac:15: warning: AC_INIT: not a literal: > >> https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa > >> autoreconf: running: libtoolize --install --copy > >> libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `bin'. > >> libtoolize: copying file `bin/config.guess' > >> libtoolize: copying file `bin/config.sub' > >> libtoolize: copying file `bin/install-sh' > >> libtoolize: copying file `bin/ltmain.sh' > >> libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to > >> configure.ac and > >> libtoolize: rerunning libtoolize, to keep the correct libtool > >> macros in-tree. > >> libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in > >> Makefile.am. > >> configure.ac:15: warning: AC_INIT: not a literal: > >> https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa > >> autoreconf: running: /usr/bin/autoconf > >> configure.ac:15: warning: AC_INIT: not a literal: > >> https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa > >> autoreconf: configure.ac: not using Autoheader > >> autoreconf: running: automake --add-missing --copy --no-force > >> configure.ac:15: warning: AC_INIT: not a literal: > >> https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa > >> configure.ac:19: installing `bin/missing' > >> src/egl/wayland/wayland-drm/Makefile.am: installing `bin/depcomp' > >> autoreconf: Leaving directory `.' > >> configure: WARNING: unrecognized options: --disable-glut > >> checking build system type... x86_64-unknown-linux-gnu > >> checking host system type... x86_64-unknown-linux-gnu > >> checking for a BSD-compatible install... /usr/bin/install -c > >> checking whether build environment is sane... yes > >> checking for a thread-safe mkdir -p... /bin/mkdir -p > >> checking for gawk... no > >> checking for mawk... mawk > >> checking whether make sets $(MAKE)... yes > >> checking for style of include used by make... GNU > >> checking for gcc... gcc > >> checking whether the C compiler works... yes > >> checking for C compiler default output file name... a.out > >> checking for suffix of executables... > >> checking whether we are cross compiling... no > >> checking for suffix of object files... o > >> checking whether we are using the GNU C compiler... yes > >> checking whether gcc accepts -g... yes > >> checking for gcc option to accept ISO C89... none needed > >> checking dependency style of gcc... gcc3 > >> checking for a sed that does not truncate output... /bin/sed > >> checking for grep that handles long lines and -e... /bin/grep > >> checking for egrep... /bin/grep -E > >> checking for fgrep... /bin/grep -F > >> checking for ld used by gcc... /usr/bin/ld > >> checking if the linker (/usr/bin/ld) is GNU ld... yes > >> checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm > >> -B > >> checking the name lister (/usr/bin/nm -B) interface... BSD nm > >> checking whether ln -s works... yes > >> checking the maximum length of command line arguments... 1572864 > >> checking whether the shell understands some XSI constructs... yes > >> checking whether the shell understands "+="... yes > >> checking for /usr/bin/ld option to reload object files... -r > >> checking for objdump... objdump > >> checking how to recognize dependent libraries... pass_all > >> checking for ar... ar > >> checking for strip... strip > >> checking for ranlib... ranlib > >> checking command to parse /usr/bin/nm -B output from gcc object... > >> ok > >> checking how to run the C preprocessor... gcc -E > >> checking for ANSI C header files... yes > >> checking for sys/types.h... yes > >> checking for sys/stat.h... yes > >> checking for stdlib.h... yes > >> checking for string.h... yes > >> checking for memory.h... yes > >> checking for strings.h... yes > >> checking for inttypes.h... yes > >> checking for stdint.h... yes > >> checking for unistd.h... yes > >> checking for dlfcn.h... yes > >> checking for objdir... .libs > >> checking if gcc supports -fno-rtti -fno-exceptions... no > >> checking for gcc option to produce PIC... -fPIC -DPIC > >> checking if gcc PIC flag -fPIC -DPIC works... yes > >> checking if gcc static flag -static works... yes > >> checking if gcc supports -c -o file.o... yes > >> checking if gcc supports -c -o file.o... (cached) yes > >> checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) > >> supports shared libraries... yes > >> checking whether -lc should be explicitly linked in... no > >> checking dynamic linker characteristics... GNU/Linux ld.so > >> checking how to hardcode library paths into programs... immediate > >> checking whether stripping libraries is possible... yes > >> checking if libtool supports shared libraries... yes > >> checking whether to build shared libraries... yes > >> checking whether to build static libraries... no > >> checking how to run the C preprocessor... gcc -E > >> checking for gcc... (cached) gcc > >> checking whether we are using the GNU C compiler... (cached) yes > >> checking whether gcc accepts -g... (cached) yes > >> checking for gcc option to accept ISO C89... (cached) none needed > >> checking dependency style of gcc... (cached) gcc3 > >> checking for g++... g++ > >> checking whether we are using the GNU C++ compiler... yes > >> checking whether g++ accepts -g... yes > >> checking dependency style of g++... gcc3 > >> checking whether we are using the GNU C++ compiler... (cached) yes > >> checking whether g++ accepts -g... (cached) yes > >> checking dependency style of g++... (cached) gcc3 > >> checking how to run the C++ preprocessor... g++ -E > >> checking for ld used by g++... /usr/bin/ld -m elf_x86_64 > >> checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... > >> yes > >> checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) > >> supports shared libraries... yes > >> checking for g++ option to produce PIC... -fPIC -DPIC > >> checking if g++ PIC flag -fPIC -DPIC works... yes > >> checking if g++ static flag -static works... yes > >> checking if g++ supports -c -o file.o... yes > >> checking if g++ supports -c -o file.o... (cached) yes > >> checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) > >> supports shared libraries... yes > >> checking dynamic linker characteristics... GNU/Linux ld.so > >> checking how to hardcode library paths into programs... immediate > >> checking for gmake... no > >> checking for make... make > >> checking for python2... no > >> checking for python... python > >> checking for a sed that does not truncate output... (cached) > >> /bin/sed > >> checking for makedepend... /usr/bin/makedepend > >> checking for flex... /usr/bin/flex > >> checking for bison... /usr/bin/bison > >> checking for gtest-config... no > >> checking if compiling with clang... no > >> checking whether gcc version is sufficient... yes > >> checking for pkg-config... /usr/bin/pkg-config > >> checking pkg-config is at least version 0.9.0... yes > >> checking whether gcc supports -fvisibility=hidden... yes > >> checking whether g++ supports -fvisibility=hidden... yes > >> checking whether to enable assembly... yes, x86_64 > >> checking for gcc option to produce PIC... -fPIC > >> checking for dlopen... no > >> checking for dlopen in -ldl... yes > >> checking for posix_memalign... yes > >> checking for LIBDRM... yes > >> checking pkg-config files for X11 are available... yes > >> checking for X11... yes > >> checking for GLPROTO... yes > >> checking for DRI2PROTO... yes > >> checking for XF86VIDMODE... yes > >> checking for DRIGL... yes > >> checking for xcb_glx_create_context_attribs_arb_checked in > >> -lxcb-glx... no > >> checking expat.h usability... yes > >> checking expat.h presence... yes > >> checking for expat.h... yes > >> checking for XML_ParserCreate in -lexpat... yes > >> checking for mincore... yes > >> checking for LIBUDEV... yes > >> checking for XCB_DRI2... no > >> checking for XORG... yes > >> checking for LIBDRM_XORG... yes > >> checking for LIBKMS_XORG... yes > >> checking for XEXT... yes > >> checking for gawk... (cached) mawk > >> checking for grep that handles long lines and -e... (cached) > >> /bin/grep > >> checking for nm... /usr/bin/nm -B > >> ./configure: line 20795: syntax error near unexpected token > >> `'$(top_srcdir)/src/egl/wayland/wayland-drm/protocol'' > >> ./configure: line 20795: ` > >> > >> WAYLAND_SCANNER_RULES('$(top_srcdir)/src/egl/wayland/wayland-drm/protocol')' > >> > >> Jose > >> > >> ----- Original Message ----- > >>> Module: Mesa > >>> Branch: master > >>> Commit: 8b902056d53e0e14f7d58ac7f95091ab06abc72e > >>> URL: > >>> > >>> http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b902056d53e0e14f7d58ac7f95091ab06abc72e > >>> > >>> Author: Benjamin Franzke <benjaminfran...@googlemail.com> > >>> Date: Tue Jan 24 20:38:01 2012 +0100 > >>> > >>> automake: src/egl/wayland > >>> > >>> So we can use the wayland scanner makro, which is way > >>> better than our previous runtime-pkgconfig hack. > >>> > >>> Reviewed-by: Matt Turner <matts...@gmail.com> > >>> > >>> --- > >>> > >>> configs/autoconf.in | 7 --- > >>> configs/default | 7 --- > >>> configure.ac | 24 +++------ > >>> src/egl/drivers/dri2/Makefile | 2 +- > >>> src/egl/main/Makefile | 2 +- > >>> src/egl/wayland/.gitignore | 9 +++ > >>> src/egl/wayland/Makefile | 30 ---------- > >>> src/egl/wayland/Makefile.am | 1 + > >>> src/egl/wayland/wayland-drm/.gitignore | 3 - > >>> src/egl/wayland/wayland-drm/Makefile | 47 > >>> ---------------- > >>> src/egl/wayland/wayland-drm/Makefile.am | 15 +++++ > >>> src/egl/wayland/wayland-egl/Makefile | 71 > >>> ------------------------- > >>> src/egl/wayland/wayland-egl/Makefile.am | 9 +++ > >>> src/egl/wayland/wayland-egl/wayland-egl.pc.in | 14 ++--- > >>> src/gallium/targets/egl-static/Makefile | 2 +- > >>> 15 files changed, 50 insertions(+), 193 deletions(-) > >>> > >>> diff --git a/configs/autoconf.in b/configs/autoconf.in > >>> index 38fe317..3de3412 100644 > >>> --- a/configs/autoconf.in > >>> +++ b/configs/autoconf.in > >>> @@ -75,7 +75,6 @@ GLESv1_CM_LIB = GLESv1_CM > >>> GLESv2_LIB = GLESv2 > >>> VG_LIB = OpenVG > >>> GLAPI_LIB = glapi > >>> -WAYLAND_EGL_LIB = wayland-egl > >>> > >>> # Library names (actual file names) > >>> GL_LIB_NAME = @GL_LIB_NAME@ > >>> @@ -87,7 +86,6 @@ GLESv1_CM_LIB_NAME = @GLESv1_CM_LIB_NAME@ > >>> GLESv2_LIB_NAME = @GLESv2_LIB_NAME@ > >>> VG_LIB_NAME = @VG_LIB_NAME@ > >>> GLAPI_LIB_NAME = @GLAPI_LIB_NAME@ > >>> -WAYLAND_EGL_LIB_NAME = @WAYLAND_EGL_LIB_NAME@ > >>> > >>> # Globs used to install the lib and all symlinks > >>> GL_LIB_GLOB = @GL_LIB_GLOB@ > >>> @@ -99,7 +97,6 @@ GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@ > >>> GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@ > >>> VG_LIB_GLOB = @VG_LIB_GLOB@ > >>> GLAPI_LIB_GLOB = @GLAPI_LIB_GLOB@ > >>> -WAYLAND_EGL_LIB_GLOB = @WAYLAND_EGL_LIB_GLOB@ > >>> > >>> # Directories to build > >>> LIB_DIR = @LIB_DIR@ > >>> @@ -143,7 +140,6 @@ GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) > >>> @GLESv1_CM_LIB_DEPS@ > >>> GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@ > >>> VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@ > >>> GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@ > >>> -WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @WAYLAND_EGL_LIB_DEPS@ > >>> > >>> # DRI dependencies > >>> MESA_MODULES = @MESA_MODULES@ > >>> @@ -202,9 +198,6 @@ GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@ > >>> EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ > >>> EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ > >>> EGL_PC_CFLAGS = @GL_PC_CFLAGS@ > >>> -WAYLAND_EGL_PC_REQ_PRIV = @WAYLAND_EGL_PC_REQ_PRIV@ > >>> -WAYLAND_EGL_PC_LIB_PRIV = @WAYLAND_EGL_PC_LIB_PRIV@ > >>> -WAYLAND_EGL_PC_CFLAGS = @WAYLAND_EGL_PC_CFLAGS@ > >>> > >>> XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@ > >>> XCB_DRI2_LIBS = @XCB_DRI2_LIBS@ > >>> diff --git a/configs/default b/configs/default > >>> index 7e1aceb..43cb510 100644 > >>> --- a/configs/default > >>> +++ b/configs/default > >>> @@ -62,7 +62,6 @@ GLESv1_CM_LIB = GLESv1_CM > >>> GLESv2_LIB = GLESv2 > >>> VG_LIB = OpenVG > >>> GLAPI_LIB = glapi > >>> -WAYLAND_EGL_LIB = wayland-egl > >>> > >>> # Library names (actual file names) > >>> GL_LIB_NAME = lib$(GL_LIB).so > >>> @@ -74,7 +73,6 @@ GLESv1_CM_LIB_NAME = lib$(GLESv1_CM_LIB).so > >>> GLESv2_LIB_NAME = lib$(GLESv2_LIB).so > >>> VG_LIB_NAME = lib$(VG_LIB).so > >>> GLAPI_LIB_NAME = lib$(GLAPI_LIB).so > >>> -WAYLAND_EGL_LIB_NAME = lib$(WAYLAND_EGL_LIB).so > >>> > >>> # globs used to install the lib and all symlinks > >>> GL_LIB_GLOB = $(GL_LIB_NAME)* > >>> @@ -86,7 +84,6 @@ GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)* > >>> GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* > >>> VG_LIB_GLOB = $(VG_LIB_NAME)* > >>> GLAPI_LIB_GLOB = $(GLAPI_LIB_NAME)* > >>> -WAYLAND_EGL_LIB_GLOB = $(WAYLAND_EGL_LIB_NAME)* > >>> > >>> DRI_CFLAGS = $(CFLAGS) > >>> DRI_CXXFLAGS = $(CXXFLAGS) > >>> @@ -134,7 +131,6 @@ GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) > >>> -lpthread > >>> GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread > >>> VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread > >>> GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread > >>> -WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -lwayland-client -ldrm > >>> > >>> # Program dependencies - specific GL libraries added in > >>> Makefiles > >>> X11_LIBS = -lX11 > >>> @@ -179,6 +175,3 @@ GLESv2_PC_CFLAGS = > >>> VG_PC_REQ_PRIV = > >>> VG_PC_LIB_PRIV = > >>> VG_PC_CFLAGS = > >>> -WAYLAND_EGL_PC_REQ_PRIV = > >>> -WAYLAND_EGL_PC_LIB_PRIV = > >>> -WAYLAND_EGL_PC_CFLAGS = > >>> diff --git a/configure.ac b/configure.ac > >>> index 2472cc1..59919f0 100644 > >>> --- a/configure.ac > >>> +++ b/configure.ac > >>> @@ -413,7 +413,6 @@ > >>> GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION} > >>> GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION} > >>> VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION} > >>> GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION} > >>> -WAYLAND_EGL_LIB_NAME='lib$(WAYLAND_EGL_LIB).'${LIB_EXTENSION} > >>> > >>> GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' > >>> GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' > >>> @@ -424,7 +423,6 @@ > >>> GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}' > >>> GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' > >>> VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' > >>> GLAPI_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLAPI_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' > >>> -WAYLAND_EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(WAYLAND_EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' > >>> > >>> AC_SUBST([GL_LIB_NAME]) > >>> AC_SUBST([GLU_LIB_NAME]) > >>> @@ -434,7 +432,6 @@ AC_SUBST([GLESv1_CM_LIB_NAME]) > >>> AC_SUBST([GLESv2_LIB_NAME]) > >>> AC_SUBST([VG_LIB_NAME]) > >>> AC_SUBST([GLAPI_LIB_NAME]) > >>> -AC_SUBST([WAYLAND_EGL_LIB_NAME]) > >>> > >>> AC_SUBST([GL_LIB_GLOB]) > >>> AC_SUBST([GLU_LIB_GLOB]) > >>> @@ -444,7 +441,6 @@ AC_SUBST([GLESv1_CM_LIB_GLOB]) > >>> AC_SUBST([GLESv2_LIB_GLOB]) > >>> AC_SUBST([VG_LIB_GLOB]) > >>> AC_SUBST([GLAPI_LIB_GLOB]) > >>> -AC_SUBST([WAYLAND_EGL_LIB_GLOB]) > >>> > >>> dnl > >>> dnl Arch/platform-specific settings > >>> @@ -1687,7 +1683,6 @@ AC_ARG_WITH([egl-platforms], > >>> [with_egl_platforms=yes]) > >>> > >>> EGL_PLATFORMS="" > >>> -WAYLAND_EGL_LIB_DEPS="" > >>> > >>> case "$with_egl_platforms" in > >>> yes) > >>> @@ -1703,7 +1698,7 @@ yes) > >>> egl_platforms=`IFS=', '; echo $with_egl_platforms` > >>> for plat in $egl_platforms; do > >>> test -d "$srcdir/src/gallium/state_trackers/egl/$plat" > >>> || \ > >>> - AC_MSG_ERROR([EGL platform '$plat' doesn't exist]) > >>> + AC_MSG_ERROR([EGL platform '$plat' does not exist]) > >>> if test "$plat" = "fbdev"; then > >>> GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS > >>> sw/fbdev" > >>> fi > >>> @@ -1713,8 +1708,9 @@ yes) > >>> if test "$plat" = "wayland"; then > >>> PKG_CHECK_MODULES([WAYLAND], [wayland-client > >>> wayland-server],, \ > >>> [AC_MSG_ERROR([cannot find > >>> libwayland-client])]) > >>> - WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS" > >>> GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS > >>> sw/wayland" > >>> + > >>> + > >>> > >>> WAYLAND_SCANNER_RULES(['$(top_srcdir)/src/egl/wayland/wayland-drm/protocol']) > >>> fi > >>> if test "$plat" = "drm" && test "x$enable_gbm" = "xno"; > >>> then > >>> AC_MSG_ERROR([EGL platform drm needs gbm]) > >>> @@ -1729,16 +1725,6 @@ yes) > >>> esac > >>> AC_SUBST([EGL_PLATFORMS]) > >>> > >>> -AC_SUBST([WAYLAND_EGL_LIB_DEPS]) > >>> -WAYLAND_EGL_PC_REQ_PRIV="wayland-client libdrm" > >>> -WAYLAND_EGL_PC_LIB_PRIV= > >>> -WAYLAND_EGL_PC_CFLAGS= > >>> - > >>> -AC_SUBST([WAYLAND_EGL_PC_REQ_PRIV]) > >>> -AC_SUBST([WAYLAND_EGL_PC_LIB_PRIV]) > >>> -AC_SUBST([WAYLAND_EGL_PC_CFLAGS]) > >>> - > >>> - > >>> AC_ARG_WITH([egl-driver-dir], > >>> [AS_HELP_STRING([--with-egl-driver-dir=DIR], > >>> [directory for EGL drivers > >>> [[default=${libdir}/egl]]])], > >>> @@ -1946,6 +1932,10 @@ dnl Substitute the config > >>> AC_CONFIG_FILES([configs/autoconf > >>> src/gbm/Makefile > >>> src/gbm/main/gbm.pc > >>> + src/egl/wayland/Makefile > >>> + src/egl/wayland/wayland-egl/Makefile > >>> + src/egl/wayland/wayland-egl/wayland-egl.pc > >>> + src/egl/wayland/wayland-drm/Makefile > >>> src/mesa/drivers/dri/dri.pc > >>> src/mesa/drivers/dri/Makefile > >>> src/mesa/drivers/dri/i915/Makefile > >>> diff --git a/src/egl/drivers/dri2/Makefile > >>> b/src/egl/drivers/dri2/Makefile > >>> index d2b1f4f..8ea3096 100644 > >>> --- a/src/egl/drivers/dri2/Makefile > >>> +++ b/src/egl/drivers/dri2/Makefile > >>> @@ -42,7 +42,7 @@ EGL_INCLUDES += -DHAVE_WAYLAND_PLATFORM > >>> $(WAYLAND_CFLAGS) \ > >>> -I$(TOP)/src/egl/wayland/wayland-egl \ > >>> -I$(TOP)/src/egl/wayland/wayland-drm > >>> EGL_LIBS += $(WAYLAND_LIBS) \ > >>> - $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a > >>> + > >>> $(TOP)/src/egl/wayland/wayland-drm/.libs/libwayland-drm.a > >>> endif > >>> > >>> include ../Makefile.template > >>> diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile > >>> index 57fb691..91d7617 100644 > >>> --- a/src/egl/main/Makefile > >>> +++ b/src/egl/main/Makefile > >>> @@ -71,7 +71,7 @@ endif > >>> > >>> # libs/cflags for display type autodetection > >>> ifneq ($(findstring wayland, $(EGL_PLATFORMS)),) > >>> -LOCAL_LIBS += > >>> $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a > >>> +LOCAL_LIBS += > >>> $(TOP)/src/egl/wayland/wayland-drm/.libs/libwayland-drm.a > >>> EGL_LIB_DEPS += $(WAYLAND_LIBS) > >>> INCLUDE_DIRS += $(WAYLAND_CFLAGS) > >>> endif > >>> diff --git a/src/egl/wayland/.gitignore > >>> b/src/egl/wayland/.gitignore > >>> new file mode 100644 > >>> index 0000000..407633a > >>> --- /dev/null > >>> +++ b/src/egl/wayland/.gitignore > >>> @@ -0,0 +1,9 @@ > >>> +.deps/ > >>> +.libs/ > >>> +Makefile > >>> +Makefile.in > >>> +libwayland-egl.la > >>> +libwayland-drm.la > >>> +wayland-drm-client-protocol.h > >>> +wayland-drm-server-protocol.h > >>> +wayland-drm-protocol.c > >>> diff --git a/src/egl/wayland/Makefile b/src/egl/wayland/Makefile > >>> deleted file mode 100644 > >>> index c38a130..0000000 > >>> --- a/src/egl/wayland/Makefile > >>> +++ /dev/null > >>> @@ -1,30 +0,0 @@ > >>> -# src/egl/wayland/Makefile > >>> - > >>> -TOP = ../../.. > >>> -include $(TOP)/configs/current > >>> - > >>> -SUBDIRS = wayland-drm wayland-egl > >>> - > >>> -default: subdirs > >>> - > >>> - > >>> -subdirs: > >>> - @for dir in $(SUBDIRS) ; do \ > >>> - if [ -d $$dir ] ; then \ > >>> - (cd $$dir && $(MAKE)) || exit 1 ; \ > >>> - fi \ > >>> - done > >>> - > >>> -install: > >>> - @for dir in $(SUBDIRS) ; do \ > >>> - if [ -d $$dir ] ; then \ > >>> - (cd $$dir && $(MAKE) install) || exit 1 ; \ > >>> - fi \ > >>> - done > >>> - > >>> -clean: > >>> - -@for dir in $(SUBDIRS) ; do \ > >>> - if [ -d $$dir ] ; then \ > >>> - (cd $$dir && $(MAKE) clean) ; \ > >>> - fi \ > >>> - done > >>> diff --git a/src/egl/wayland/Makefile.am > >>> b/src/egl/wayland/Makefile.am > >>> new file mode 100644 > >>> index 0000000..ca7207c > >>> --- /dev/null > >>> +++ b/src/egl/wayland/Makefile.am > >>> @@ -0,0 +1 @@ > >>> +SUBDIRS = wayland-drm wayland-egl > >>> diff --git a/src/egl/wayland/wayland-drm/.gitignore > >>> b/src/egl/wayland/wayland-drm/.gitignore > >>> deleted file mode 100644 > >>> index f4ed848..0000000 > >>> --- a/src/egl/wayland/wayland-drm/.gitignore > >>> +++ /dev/null > >>> @@ -1,3 +0,0 @@ > >>> -wayland-drm-client-protocol.h > >>> -wayland-drm-server-protocol.h > >>> -wayland-drm-protocol.c > >>> diff --git a/src/egl/wayland/wayland-drm/Makefile > >>> b/src/egl/wayland/wayland-drm/Makefile > >>> deleted file mode 100644 > >>> index 42222a9..0000000 > >>> --- a/src/egl/wayland/wayland-drm/Makefile > >>> +++ /dev/null > >>> @@ -1,47 +0,0 @@ > >>> -# src/egl/wayland/wayland-drm/Makefile > >>> - > >>> -TOP = ../../../.. > >>> -include $(TOP)/configs/current > >>> - > >>> -GEN_SOURCES = wayland-drm-protocol.c > >>> - > >>> -GEN_HEADERS = wayland-drm-client-protocol.h > >>> wayland-drm-server-protocol.h > >>> - > >>> -wayland_drm_SOURCES = wayland-drm.c $(GEN_SOURCES) > >>> -wayland_drm_OBJECTS = $(wayland_drm_SOURCES:.c=.o) > >>> - > >>> -wayland_drm_INCLUDES = \ > >>> - $(WAYLAND_CFLAGS) \ > >>> - -I$(TOP)/src/egl/main \ > >>> - -I$(TOP)/include > >>> - > >>> -# Generate protocol sources > >>> -prefix=$(shell $(PKG_CONFIG) --variable=prefix wayland-server) > >>> -exec_prefx=$(shell $(PKG_CONFIG) --variable=exec_prefix > >>> wayland-server) > >>> -wayland_protocoldir = $(PWD)/protocol > >>> -wayland_scanner=$(exec_prefix)/bin/wayland-scanner > >>> - > >>> -default: depend libwayland-drm.a $(GEN_SOURCES) $(GEN_HEADERS) > >>> - > >>> -libwayland-drm.a: $(wayland_drm_OBJECTS) Makefile > >>> - $(MKLIB) -o wayland-drm -static $(wayland_drm_OBJECTS) > >>> - > >>> -depend: > >>> - rm -f depend > >>> - touch depend > >>> - $(MKDEP) $(MKDEP_OPTIONS) $(wayland_drm_INCLUDES) > >>> $(wayland_drm_SOURCES) 2> /dev/null > >>> - > >>> -clean: > >>> - rm -rf libwayland-drm.a $(wayland_drm_OBJECTS) \ > >>> - $(GEN_SOURCES) $(GEN_HEADERS) > >>> - rm -f depend depend.bak > >>> - > >>> -install: > >>> - @echo -n "" > >>> - > >>> -$(wayland_drm_OBJECTS): %.o: %.c $(GEN_HEADERS) > >>> - $(CC) -c $(wayland_drm_INCLUDES) $(CFLAGS) $< -o $@ > >>> - > >>> -include $(prefix)/share/aclocal/wayland-scanner.mk > >>> - > >>> -sinclude depend > >>> diff --git a/src/egl/wayland/wayland-drm/Makefile.am > >>> b/src/egl/wayland/wayland-drm/Makefile.am > >>> new file mode 100644 > >>> index 0000000..cf15eda > >>> --- /dev/null > >>> +++ b/src/egl/wayland/wayland-drm/Makefile.am > >>> @@ -0,0 +1,15 @@ > >>> +AM_CFLAGS = -I$(top_srcdir)/src/egl/main \ > >>> + -I$(top_srcdir)/include \ > >>> + $(DEFINES) \ > >>> + $(WAYLAND_CFLAGS) > >>> + > >>> +noinst_LTLIBRARIES = libwayland-drm.la > >>> +libwayland_drm_la_SOURCES = wayland-drm.c wayland-drm-protocol.c > >>> +noinst_HEADERS = wayland-drm.h > >>> + > >>> +BUILT_SOURCES = wayland-drm-protocol.c \ > >>> + wayland-drm-client-protocol.h \ > >>> + wayland-drm-server-protocol.h > >>> +CLEANFILES = $(BUILT_SOURCES) > >>> + > >>> +@wayland_scanner_rules@ > >>> diff --git a/src/egl/wayland/wayland-egl/Makefile > >>> b/src/egl/wayland/wayland-egl/Makefile > >>> deleted file mode 100644 > >>> index b9d13dc..0000000 > >>> --- a/src/egl/wayland/wayland-egl/Makefile > >>> +++ /dev/null > >>> @@ -1,71 +0,0 @@ > >>> -# src/egl/wayland/wayland-egl/Makefile > >>> - > >>> -TOP = ../../../.. > >>> -include $(TOP)/configs/current > >>> - > >>> -INCLUDE_DIRS = -I$(TOP)/include \ > >>> - -I$(TOP)/include/EGL \ > >>> - -I$(TOP)/src/egl/wayland/wayland-drm > >>> - > >>> - > >>> -HEADERS = wayland-egl-priv.h > >>> -SOURCES = wayland-egl.c > >>> - > >>> -OBJECTS = $(SOURCES:.c=.o) > >>> - > >>> -LOCAL_CFLAGS = $(LIBDRM_CFLAGS) \ > >>> - $(WAYLAND_CFLAGS) > >>> - > >>> -LOCAL_LIBS = > >>> - > >>> -.c.o: > >>> - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@ > >>> - > >>> - > >>> -default: depend library > >>> - > >>> -# wayland-egl Library > >>> -library: $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME) > >>> - > >>> -$(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME): $(OBJECTS) > >>> $(LOCAL_LIBS) > >>> - $(MKLIB) -o $(WAYLAND_EGL_LIB) -linker '$(CC)' -ldflags > >>> '$(LDFLAGS)' \ > >>> - -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ > >>> - -L$(TOP)/$(LIB_DIR) $(WAYLAND_EGL_LIB_DEPS) \ > >>> - $(OBJECTS) $(LOCAL_LIBS) > >>> - > >>> -PKG_CONFIG_DIR = $(INSTALL_LIB_DIR)/pkgconfig > >>> - > >>> -gl_pcedit = sed \ > >>> - -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ > >>> - -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \ > >>> - -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ > >>> - -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' > >>> \ > >>> - -e > >>> 's,@WAYLAND_EGL_PC_REQ_PRIV@,$(WAYLAND_EGL_PC_REQ_PRIV),' \ > >>> - -e > >>> 's,@WAYLAND_EGL_PC_LIB_PRIV@,$(WAYLAND_EGL_PC_LIB_PRIV),' \ > >>> - -e 's,@WAYLAND_EGL_PC_CFLAGS@,$(WAYLAND_EGL_PC_CFLAGS),' \ > >>> - -e 's,@WAYLAND_EGL_LIB@,$(WAYLAND_EGL_LIB),' > >>> - > >>> -wayland-egl.pc: wayland-egl.pc.in > >>> - $(gl_pcedit) $< > $@ > >>> - > >>> -install: default wayland-egl.pc > >>> - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) > >>> - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_GLOB) \ > >>> - $(DESTDIR)$(INSTALL_LIB_DIR) > >>> - $(INSTALL) -d $(DESTDIR)$(PKG_CONFIG_DIR) > >>> - $(INSTALL) -m 644 wayland-egl.pc > >>> $(DESTDIR)$(PKG_CONFIG_DIR) > >>> - > >>> -clean: > >>> - -rm -f *.o > >>> - -rm -f depend depend.bak > >>> - > >>> -depend: $(SOURCES) $(HEADERS) > >>> - @ echo "running $(MKDEP)" > >>> - @ rm -f depend > >>> - @ touch depend > >>> - $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \ > >>> - $(SOURCES) $(HEADERS) > /dev/null 2>/dev/null > >>> - > >>> - > >>> --include depend > >>> -# DO NOT DELETE > >>> diff --git a/src/egl/wayland/wayland-egl/Makefile.am > >>> b/src/egl/wayland/wayland-egl/Makefile.am > >>> new file mode 100644 > >>> index 0000000..a19a5fc > >>> --- /dev/null > >>> +++ b/src/egl/wayland/wayland-egl/Makefile.am > >>> @@ -0,0 +1,9 @@ > >>> +pkgconfigdir = $(libdir)/pkgconfig > >>> +pkgconfig_DATA = wayland-egl.pc > >>> + > >>> +AM_CFLAGS = $(DEFINES) > >>> + > >>> +lib_LTLIBRARIES = libwayland-egl.la > >>> +noinst_HEADERS = wayland-egl-priv.h > >>> +libwayland_egl_la_SOURCES = wayland-egl.c > >>> +libwayland_egl_la_LDFLAGS = -version-info 1 > >>> diff --git a/src/egl/wayland/wayland-egl/wayland-egl.pc.in > >>> b/src/egl/wayland/wayland-egl/wayland-egl.pc.in > >>> index 3c2067c..f8a8df2 100644 > >>> --- a/src/egl/wayland/wayland-egl/wayland-egl.pc.in > >>> +++ b/src/egl/wayland/wayland-egl/wayland-egl.pc.in > >>> @@ -1,12 +1,10 @@ > >>> -prefix=@INSTALL_DIR@ > >>> -exec_prefix=${prefix} > >>> -libdir=@INSTALL_LIB_DIR@ > >>> -includedir=@INSTALL_INC_DIR@ > >>> +prefix=@prefix@ > >>> +exec_prefix=@exec_prefix@ > >>> +libdir=@libdir@ > >>> +includedir=@includedir@ > >>> > >>> Name: wayland-egl > >>> Description: Mesa wayland-egl library > >>> -Requires.private: @WAYLAND_EGL_PC_REQ_PRIV@ > >>> Version: @VERSION@ > >>> -Libs: -L${libdir} -l@WAYLAND_EGL_LIB@ > >>> -Libs.private: @WAYLAND_EGL_PC_LIB_PRIV@ > >>> -Cflags: -I${includedir} @WAYLAND_EGL_PC_CFLAGS@ > >>> +Libs: -L${libdir} -lwayland-egl > >>> +Cflags: -I${includedir} > >>> diff --git a/src/gallium/targets/egl-static/Makefile > >>> b/src/gallium/targets/egl-static/Makefile > >>> index 79a098a..70e4362 100644 > >>> --- a/src/gallium/targets/egl-static/Makefile > >>> +++ b/src/gallium/targets/egl-static/Makefile > >>> @@ -53,7 +53,7 @@ endif > >>> ifneq ($(findstring wayland, $(EGL_PLATFORMS)),) > >>> egl_CPPFLAGS += $(LIBDRM_CFLAGS) > >>> egl_LIBS += $(TOP)/src/gallium/winsys/sw/wayland/libws_wayland.a > >>> -egl_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a > >>> +egl_LIBS += > >>> $(TOP)/src/egl/wayland/wayland-drm/.libs/libwayland-drm.a > >>> egl_SYS += $(LIBDRM_LIB) $(WAYLAND_LIBS) > >>> endif > >>> ifneq ($(findstring drm, $(EGL_PLATFORMS)),) > >>> > >>> _______________________________________________ > >>> mesa-commit mailing list > >>> mesa-com...@lists.freedesktop.org > >>> http://lists.freedesktop.org/mailman/listinfo/mesa-commit > >>> > >> _______________________________________________ > >> mesa-dev mailing list > >> mesa-dev@lists.freedesktop.org > >> http://lists.freedesktop.org/mailman/listinfo/mesa-dev > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
