From 53c62d3fb0ee9aacc7a4aa08b4c42a3fb2127b2f Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 13 Sep 2012 10:10:14 -0700 Subject: [PATCH] targets/gbm: Convert to automake --- configure.ac | 7 ++-- src/gallium/targets/gbm/.gitignore | 1 + src/gallium/targets/gbm/Makefile | 41 ----------------------- src/gallium/targets/gbm/Makefile.am | 66 +++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 44 deletions(-) create mode 100644 src/gallium/targets/gbm/.gitignore delete mode 100644 src/gallium/targets/gbm/Makefile create mode 100644 src/gallium/targets/gbm/Makefile.am diff --git a/configure.ac b/configure.ac index 6ad1ee9..3c328b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1938,12 +1938,12 @@ AM_CONDITIONAL(HAVE_GALLIUM_LLVMPIPE, test "x$HAVE_GALLIUM_LLVMPIPE" = xyes) if test "x$enable_gallium_loader" = xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/null" GALLIUM_PIPE_LOADER_DEFINES="-DHAVE_PIPE_LOADER_SW" - GALLIUM_PIPE_LOADER_LIBS="\$(TOP)/src/gallium/auxiliary/pipe-loader/libpipe_loader.a" - GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(TOP)/src/gallium/winsys/sw/null/libws_null.a" + GALLIUM_PIPE_LOADER_LIBS="\$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la" + GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la" if test "x$HAVE_WINSYS_XLIB" = xyes; then GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB" - GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a" + GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la" fi if test "x$enable_gallium_drm_loader" = xyes; then @@ -2076,6 +2076,7 @@ AC_CONFIG_FILES([configs/current src/gallium/targets/dri-swrast/Makefile src/gallium/targets/dri-vmwgfx/Makefile src/gallium/targets/egl-static/Makefile + src/gallium/targets/gbm/Makefile src/gallium/targets/opencl/Makefile src/gallium/targets/libgl-xlib/Makefile src/gallium/targets/vdpau-nouveau/Makefile diff --git a/src/gallium/targets/gbm/.gitignore b/src/gallium/targets/gbm/.gitignore new file mode 100644 index 0000000..f3c7a7c --- /dev/null +++ b/src/gallium/targets/gbm/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile deleted file mode 100644 index 17d5648..0000000 --- a/src/gallium/targets/gbm/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# src/gallium/targets/gbm/Makefile - -TOP = ../../../.. -include $(TOP)/configs/current - -GBM_BACKEND = gbm_gallium_drm -GBM_SOURCES = gbm.c - -GBM_INCLUDES = \ - -I$(TOP)/include \ - -I$(TOP)/src/gallium/state_trackers/gbm \ - -I$(TOP)/src/gbm/main \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/winsys \ - -I$(TOP)/src/gallium/include - -GBM_LIBS = $(LIBUDEV_LIBS) $(LIBDRM_LIBS) -lm \ - $(TOP)/src/gallium/state_trackers/gbm/libgbm.a \ - $(GALLIUM_PIPE_LOADER_LIBS) $(GALLIUM_AUXILIARIES) - -GBM_CFLAGS = \ - -DPIPE_SEARCH_DIR=\"$(PIPE_INSTALL_DIR)\" \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ - $(LIBUDEV_CFLAGS) \ - $(LIBDRM_CFLAGS) - -GBM_EXTRA_TARGETS = pipes -GBM_EXTRA_INSTALL = install-pipes -GBM_EXTRA_CLEAN = clean-pipes - -include $(TOP)/src/gbm/backends/Makefile.template - -PIPE_SRC_DIR = $(TOP)/src/gallium/targets/pipe-loader -PIPE_INSTALL_DIR = $(INSTALL_LIB_DIR)/gbm - -pipes: - @$(MAKE) -C $(PIPE_SRC_DIR) -install-pipes: - @$(MAKE) -C $(PIPE_SRC_DIR) PIPE_INSTALL_DIR=$(PIPE_INSTALL_DIR) install -clean-pipes: - @$(MAKE) -C $(PIPE_SRC_DIR) clean diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am new file mode 100644 index 0000000..be2dd92 --- /dev/null +++ b/src/gallium/targets/gbm/Makefile.am @@ -0,0 +1,66 @@ +# Copyright © 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +include $(top_srcdir)/src/gallium/Automake.inc + +gbmdir = $(libdir)/gbm + +AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/gallium/state_trackers/gbm \ + -I$(top_srcdir)/src/gbm/main \ + -I$(top_srcdir)/src/gallium/winsys \ + $(GALLIUM_PIPE_LOADER_DEFINES) \ + -DPIPE_SEARCH_DIR=\"$(gbmdir)\" + +AM_CFLAGS = \ + $(GALLIUM_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ + $(LIBDRM_CFLAGS) + +gbm_LTLIBRARIES = gbm_gallium_drm.la + +gbm_gallium_drm_la_SOURCES = gbm.c + +gbm_gallium_drm_la_LIBADD = \ + $(GALLIUM_PIPE_LOADER_LIBS) \ + $(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(LIBUDEV_LIBS) \ + $(LIBDRM_LIBS) \ + -lm + +gbm_gallium_drm_la_LDFLAGS = -no-undefined -avoid-version -module + +# FIXME: this shouldn't be needed +if HAVE_MESA_LLVM +gbm_gallium_drm_la_LINK = $(CXXLINK) $(gbm_gallium_drm_la_LDFLAGS) +# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable +nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy-cpp.cpp + +gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS) +gbm_gallium_drm_la_LDFLAGS += $(LLVM_LDFLAGS) +else +gbm_gallium_drm_la_LINK = $(CXXLINK) $(gbm_gallium_drm_la_LDFLAGS) +# Mention a dummy pure C file to trigger generation of the $(LINK) variable +nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy-c.c +endif -- 2.7.4