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>

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index a728162bd9d7c672d682a1dc6931a6ab1d22f609..c33def742f17cd536308fdc19ec3f8915903b7e2 100644 (file)
--- 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 fd0ccf88cc5a6a261bdf9641b4c8b0a6ccebd027..c6528ff97cb0ce1cb01a32f041f8ac61dc0abe6e 100644 (file)
--- 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 9f4deba0c1ecadb4f5a9bc29cba1f0f5851d8be0..e407304fed94319a64ec91c551ed540db6cfca47 100644 (file)
--- 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 5051e8246e3801456f27673d9fcbd5e629c35f9c..400a70b300fec11dd95e9001a878957d12e1c358 100644 (file)
--- 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 b5221472ef05e14d12f4f1a85ed8d5dcc3e484dd..d36a8b80b74f7db9d10c6c59f218400540311731 100644 (file)
--- 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 56b7f3ffc664f9a9194b9cb0dbfe491efd34dfce..26783ab6f6d1fe69e0dd47c05e7703397eda4b71 100644 (file)
--- 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 \