diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-17 14:34:52 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-07-10 01:06:49 +0100 |
| commit | 29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5 (patch) | |
| tree | 1e3c805a280ff354539fd82d33946b2b8cc90bd0 /src/gallium/state_trackers/dri/Makefile.am | |
| parent | f6483aa6947437c42928c879dd28d758b7d12901 (diff) | |
| download | external_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.zip external_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.tar.gz external_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.tar.bz2 | |
st/dri: merge dri/drm and dri/sw backends
Move the driver_name to dri2/drisw and remove all the SPLIT_TAGETS
mayhem. In the next step we'll unify the dri and dri-swrast targets,
completing the gallium DRI megadriver.
v2: Remove leftover st/dri Makefiles from CONFIG_FILES. Spotted by
Thomas Helland.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium/state_trackers/dri/Makefile.am')
| -rw-r--r-- | src/gallium/state_trackers/dri/Makefile.am | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am index b89d02f..bda75c3 100644 --- a/src/gallium/state_trackers/dri/Makefile.am +++ b/src/gallium/state_trackers/dri/Makefile.am @@ -1,4 +1,5 @@ # Copyright © 2012 Intel Corporation +# Copyright © 2014 Emil Velikov # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -20,12 +21,39 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -SUBDIRS = +include Makefile.sources +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CPPFLAGS = \ + $(GALLIUM_PIPE_LOADER_DEFINES) \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/gallium/state_trackers/dri/common \ + -I$(top_srcdir)/src/mesa/drivers/dri/common \ + -I$(top_builddir)/src/mesa/drivers/dri/common \ + $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) \ + $(VISIBILITY_CFLAGS) + +if HAVE_GALLIUM_STATIC_TARGETS +AM_CPPFLAGS += \ + -DGALLIUM_STATIC_TARGETS=1 +endif # HAVE_GALLIUM_STATIC_TARGETS + +noinst_LTLIBRARIES = libdri.la +libdri_la_SOURCES = $(common_SOURCES) if HAVE_DRISW -SUBDIRS += sw +if !HAVE_DRI2 +AM_CPPFLAGS += \ + -D__NOT_HAVE_DRM_H endif +libdri_la_SOURCES += $(drisw_SOURCES) +endif + -if HAVE_LIBDRM -SUBDIRS += drm +if HAVE_DRI2 +libdri_la_SOURCES += $(dri2_SOURCES) endif |