diff options
author | Matt Turner <mattst88@gmail.com> | 2012-09-05 11:19:11 -0700 |
---|---|---|
committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2012-12-06 11:53:38 +0100 |
commit | baf1b91df77290390552545453db93d0527b9fcb (patch) | |
tree | 9c1f9b8fc376a41b59c0e284d39b66336b7831d4 | |
parent | 656b9fe10808ac6964433303ceb24504bae5dfc8 (diff) |
targets/dri-vmwgfx: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/gallium/targets/dri-vmwgfx/.gitignore | 1 | ||||
-rw-r--r-- | src/gallium/targets/dri-vmwgfx/Makefile | 24 | ||||
-rw-r--r-- | src/gallium/targets/dri-vmwgfx/Makefile.am | 55 |
4 files changed, 57 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index f3fe8eae0c..1f55307b57 100644 --- a/configure.ac +++ b/configure.ac @@ -2027,6 +2027,7 @@ AC_CONFIG_FILES([configs/current src/gallium/targets/dri-r600/Makefile src/gallium/targets/dri-radeonsi/Makefile src/gallium/targets/dri-swrast/Makefile + src/gallium/targets/dri-vmwgfx/Makefile src/gallium/targets/opencl/Makefile src/gallium/winsys/Makefile src/gallium/winsys/i915/drm/Makefile diff --git a/src/gallium/targets/dri-vmwgfx/.gitignore b/src/gallium/targets/dri-vmwgfx/.gitignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/src/gallium/targets/dri-vmwgfx/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/targets/dri-vmwgfx/Makefile b/src/gallium/targets/dri-vmwgfx/Makefile deleted file mode 100644 index 8c716f42fe..0000000000 --- a/src/gallium/targets/dri-vmwgfx/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = vmwgfx_dri.so - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \ - $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \ - $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/drivers/svga/libsvga.a - -C_SOURCES = \ - target.c \ - vmw_powf.c \ - $(COMMON_GALLIUM_SOURCES) - -DRIVER_DEFINES = \ - -DGALLIUM_RBUG -DGALLIUM_TRACE - -include ../Makefile.dri - -symlinks: diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am new file mode 100644 index 0000000000..5e049d9e8d --- /dev/null +++ b/src/gallium/targets/dri-vmwgfx/Makefile.am @@ -0,0 +1,55 @@ +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + $(GALLIUM_CFLAGS) \ + $(PTHREAD_CFLAGS) \ + $(LIBDRM_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/src/gallium/winsys \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/mapi \ + -DGALLIUM_RBUG \ + -DGALLIUM_TRACE + +dridir = $(DRI_DRIVER_INSTALL_DIR) +dri_LTLIBRARIES = vmwgfx_dri.la + +vmwgfx_dri_la_SOURCES = \ + target.c \ + vmw_powf.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c + +vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + +vmwgfx_dri_la_LIBADD = \ + $(top_builddir)/src/mesa/libmesagallium.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ + $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ + $(top_builddir)/src/gallium/drivers/svga/libsvga.la \ + $(GALLIUM_DRI_LIB_DEPS) + +if HAVE_MESA_LLVM +vmwgfx_dri_la_LINK = $(CXXLINK) $(vmwgfx_dri_la_LDFLAGS) +# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable +nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-cpp.cpp + +vmwgfx_dri_la_LDFLAGS += $(LLVM_LDFLAGS) +vmwgfx_dri_la_LIBADD += $(LLVM_LIBS) +else +vmwgfx_dri_la_LINK = $(LINK) $(vmwgfx_dri_la_LDFLAGS) +# Mention a dummy pure C file to trigger generation of the $(LINK) variable +nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-c.c +endif + +# Provide compatibility with scripts for the old Mesa build system for +# a while by putting a link to the driver into /lib of the build tree. +all-local: vmwgfx_dri.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium + ln -f .libs/vmwgfx_dri.so $(top_builddir)/$(LIB_DIR)/gallium/vmwgfx_dri.so |