diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-10-14 16:23:50 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-11-21 12:52:17 +0000 |
| commit | 6bcd5f0d02fff2db0c330af7d139d7a60b59e0e2 (patch) | |
| tree | 931818aed41ac18467638bd50be7b53e9869befe | |
| parent | b7875ca4939bc5db145b463b7a9a1ea0f9fbccb8 (diff) | |
| download | external_mesa3d-6bcd5f0d02fff2db0c330af7d139d7a60b59e0e2.zip external_mesa3d-6bcd5f0d02fff2db0c330af7d139d7a60b59e0e2.tar.gz external_mesa3d-6bcd5f0d02fff2db0c330af7d139d7a60b59e0e2.tar.bz2 | |
automake: use GALLIUM_PIPE_LOADER_DEFINES only where applicable
As of last commit we no longer need the defines in order to have the
function prototypes.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gallium/tests/trivial/Makefile.am | 3 |
6 files changed, 2 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index a728162..c33def7 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -67,7 +67,6 @@ COMMON_VL_CFLAGS = \ $(VL_CFLAGS) \ $(DRI2PROTO_CFLAGS) \ $(LIBDRM_CFLAGS) \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" if HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am index fd0ccf8..c6528ff 100644 --- a/src/gallium/state_trackers/clover/Makefile.am +++ b/src/gallium/state_trackers/clover/Makefile.am @@ -1,7 +1,6 @@ include Makefile.sources AM_CPPFLAGS = \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am index 9f4deba..e407304 100644 --- a/src/gallium/state_trackers/dri/Makefile.am +++ b/src/gallium/state_trackers/dri/Makefile.am @@ -25,7 +25,6 @@ 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 \ diff --git a/src/gallium/state_trackers/xa/Makefile.am b/src/gallium/state_trackers/xa/Makefile.am index 5051e82..400a70b 100644 --- a/src/gallium/state_trackers/xa/Makefile.am +++ b/src/gallium/state_trackers/xa/Makefile.am @@ -29,7 +29,6 @@ AM_CFLAGS = \ $(VISIBILITY_CFLAGS) AM_CPPFLAGS = \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" if HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index b522147..d36a8b8 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -42,8 +42,7 @@ AM_CPPFLAGS = \ else AM_CPPFLAGS = \ - -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ - $(GALLIUM_PIPE_LOADER_DEFINES) + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" endif diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am index 56b7f3f..26783ab 100644 --- a/src/gallium/tests/trivial/Makefile.am +++ b/src/gallium/tests/trivial/Makefile.am @@ -8,8 +8,7 @@ AM_CFLAGS = \ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/src/gallium/winsys \ - -DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" \ - $(GALLIUM_PIPE_LOADER_DEFINES) + -DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" LDADD = \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ |