Mesa (master): build: remove unused API_DEFINES

Andreas Boll ab at kemper.freedesktop.org
Wed May 1 19:39:51 UTC 2013 

Module: Mesa
Branch: master
Commit: be0fec4f5b5aa6e3f4cbde835a2f5f2a2624dcfe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=be0fec4f5b5aa6e3f4cbde835a2f5f2a2624dcfe

Author: Andreas Boll <andreas.boll.dev at gmail.com>
Date:   Wed Feb 27 10:10:14 2013 +0100

build: remove unused API_DEFINES

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

---

 configure.ac                               |    3 ---
 src/glsl/Makefile.am                       |    3 +--
 src/mesa/Makefile.am                       |    2 +-
 src/mesa/drivers/dri/common/Makefile.am    |    1 -
 src/mesa/drivers/dri/nouveau/Makefile.am   |    1 -
 src/mesa/drivers/dri/r200/Makefile.am      |    1 -
 src/mesa/drivers/dri/radeon/Makefile.am    |    1 -
 src/mesa/drivers/dri/swrast/Makefile.am    |    1 -
 src/mesa/drivers/osmesa/Makefile.am        |    3 +--
 src/mesa/drivers/x11/Makefile.am           |    1 -
 src/mesa/libdricore/Makefile.am            |    1 -
 src/mesa/main/tests/Makefile.am            |    2 +-
 src/mesa/main/tests/hash_table/Makefile.am |    2 +-
 src/mesa/program/Makefile.am               |    2 +-
 src/mesa/x86-64/Makefile.am                |    1 -
 src/mesa/x86/Makefile.am                   |    1 -
 16 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1c84091..5bc8c94 100644
--- 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 d0e5cd1..2bbad3d 100644
--- 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 2d077f8..d5f5f5b 100644
--- 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 dfc8f3b..ce4119d 100644
--- 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 00ee1df..2b47f75 100644
--- 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 4991399..4357922 100644
--- 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 b0aaa45..43de059 100644
--- 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 3e53907..d3da196 100644
--- 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 2503401..082c294 100644
--- 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 2b0a163..32bd385 100644
--- 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 dce5170..56ceeb7 100644
--- 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 4acc815..87262d5 100644
--- 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 f63841d..0330ebb 100644
--- 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 b0e9eff..ab565e2 100644
--- 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 baeb4b6..80e7917 100644
--- 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 5976bb4..21ce360 100644
--- 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

More information about the mesa-commit mailing list