build: remove unused API_DEFINES

Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/configure.ac b/configure.ac
index 1c840911d4d43880586058056ecdd84821aa42e5..5bc8c94a2ecc127b1418daad5a46a4f457ddd406 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -687,9 +687,6 @@ if test "x$enable_opengl" = xno -a \
     AC_MSG_ERROR([Building OpenGL ES2 without OpenGL is not supported])
 fi
 
-API_DEFINES=""
-AC_SUBST([API_DEFINES])
-
 AM_CONDITIONAL(HAVE_OPENGL, test "x$enable_opengl" = xyes)
 AM_CONDITIONAL(HAVE_OPENGL_ES1, test "x$enable_gles1" = xyes)
 AM_CONDITIONAL(HAVE_OPENGL_ES2, test "x$enable_gles2" = xyes)

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index d0e5cd1d05e80636a6648f2c700716617c283cb5..2bbad3d65ce94d34f1bc1162e838e023f56a30d3 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -27,8 +27,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/glsl/glcpp \
        -I$(top_srcdir)/src/gtest/include \
-       $(DEFINES) \
-       $(API_DEFINES)
+       $(DEFINES)
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 2d077f865da4abc0e24c85ac5cebb02027b5f3db..d5f5f5b866707f5b832b21f3675035b511371f05 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -93,7 +93,7 @@ SRCDIR = $(top_srcdir)/src/mesa/
 BUILDDIR = $(top_builddir)/src/mesa/
 include Makefile.sources
 
-AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
+AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
 AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
 

diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
index dfc8f3b7a11502b25c1294474ea3a05685fa2eba..ce4119d0ffff0f2f33bb1c9e6c826c6b9f927173 100644 (file)
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ b/src/mesa/drivers/dri/common/Makefile.am
@@ -27,7 +27,6 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 

diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index 00ee1df36e0c9b74b81ebb8834b9915d0ba41f18..2b47f75340f89992263e1f42531c78f7d2d0019e 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -30,7 +30,6 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(VISIBILITY_CFLAGS) \
        $(NOUVEAU_CFLAGS)
 

diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
index 49913991f82ddc71ab9741a9ec3494fbd3a02e04..4357922341ba5f22e0e7fc6b3369d22375ba69b8 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -33,7 +33,6 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
        -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(VISIBILITY_CFLAGS) \
        $(RADEON_CFLAGS)
 

diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
index b0aaa4529241987cd4da93160378188c6e550b5d..43de05972b0b38d189031c43345965edaeffabe5 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile.am
+++ b/src/mesa/drivers/dri/radeon/Makefile.am
@@ -33,7 +33,6 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
        -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(VISIBILITY_CFLAGS) \
        $(RADEON_CFLAGS)
 

diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
index 3e539073ce56b2d8ec4512aa8d08411452ab0abe..d3da19651cba62413824c194657a34766414f637 100644 (file)
--- a/src/mesa/drivers/dri/swrast/Makefile.am
+++ b/src/mesa/drivers/dri/swrast/Makefile.am
@@ -31,7 +31,6 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(VISIBILITY_CFLAGS)
 
 dridir = $(DRI_DRIVER_INSTALL_DIR)

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 250340146c00429d4459577985a6d67348da898e..082c294a3ef45987a58e28dab641474248268d66 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -26,8 +26,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mapi \
        -I$(top_builddir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
-       $(DEFINES) \
-       $(API_DEFINES)
+       $(DEFINES)
 AM_CFLAGS = $(PTHREAD_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(PTHREAD_CFLAGS) \

diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index 2b0a163dc5a8cb0f2c311c3cd3e7a6daf20d12b2..32bd385ec8671807dd88e6e45628ad191849fe0c 100644 (file)
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -29,7 +29,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mesa/main \
        $(X11_INCLUDES) \
-       $(API_DEFINES) \
        $(DEFINES)
 
 if HAVE_X11_DRIVER

diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index dce51704635c8f78199681b5ecab8640c98b7b9b..56ceeb7141a5c569b0d3051f80c8334b8cf3dcba 100644 (file)
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -28,7 +28,6 @@ noinst_PROGRAMS =
 
 AM_CPPFLAGS = \
        $(INCLUDE_DIRS) \
-       $(API_DEFINES) \
        $(DEFINES) \
        -DUSE_DRICORE
 

diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
index 4acc815e6f21c5e789d655468b89ab7807549dcd..87262d52aa06110096a02f155e75509ed374f26d 100644 (file)
--- a/src/mesa/main/tests/Makefile.am
+++ b/src/mesa/main/tests/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/include \
-       $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
+       $(DEFINES) $(INCLUDE_DIRS)
 
 TESTS = main-test
 check_PROGRAMS = main-test

diff --git a/src/mesa/main/tests/hash_table/Makefile.am b/src/mesa/main/tests/hash_table/Makefile.am
index f63841d221ea39b021dd0ee434f9920d89d92e33..0330ebb3e8fbf077819b0ca051f0a542cbd41802 100644 (file)
--- a/src/mesa/main/tests/hash_table/Makefile.am
+++ b/src/mesa/main/tests/hash_table/Makefile.am
@@ -21,7 +21,7 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/mesa/main \
-       $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
+       $(DEFINES) $(INCLUDE_DIRS)
 
 LDADD = \
        $(top_builddir)/src/mesa/libmesa.la \

diff --git a/src/mesa/program/Makefile.am b/src/mesa/program/Makefile.am
index b0e9eff55cfeb36a1cb3abb8a402dff60ace8789..ab565e2518231a1f6b1e2794b98466da2bb5fc3b 100644 (file)
--- a/src/mesa/program/Makefile.am
+++ b/src/mesa/program/Makefile.am
@@ -21,7 +21,7 @@
 
 include ../Makefile.sources
 
-AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
+AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 libdricore_program_la_CFLAGS = $(NOVISIBILITY_CFLAGS)

diff --git a/src/mesa/x86-64/Makefile.am b/src/mesa/x86-64/Makefile.am
index baeb4b65ea72f5b4c19ecada6cb10e3699fcaee0..80e791784ec52101b2b398d7c3f83fddddc244c0 100644 (file)
--- a/src/mesa/x86-64/Makefile.am
+++ b/src/mesa/x86-64/Makefile.am
@@ -25,7 +25,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \
-       $(API_DEFINES) \
        $(DEFINES)
 
 noinst_PROGRAMS = gen_matypes

diff --git a/src/mesa/x86/Makefile.am b/src/mesa/x86/Makefile.am
index 5976bb47c5bd1cc2a76abb42a12364c9ca57239a..21ce3607ae5f7514b0a96787db35177011b957e0 100644 (file)
--- a/src/mesa/x86/Makefile.am
+++ b/src/mesa/x86/Makefile.am
@@ -25,7 +25,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \
-       $(API_DEFINES) \
        $(DEFINES)
 
 noinst_PROGRAMS = gen_matypes