From 63d2d7b1866c54d27a5c91dbe834bbc474550564 Mon Sep 17 00:00:00 2001 From: Andreas Boll Date: Wed, 27 Feb 2013 10:10:14 +0100 Subject: build: remove unused API_DEFINES --- 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 228c3248c6..a273b89fe7 100644 --- a/configure.ac +++ b/configure.ac @@ -676,9 +676,6 @@ if test "x$enable_opengl" = xno -a \ AC_MSG_ERROR([at least one API should be enabled]) 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 d0e5cd1d05..2bbad3d65c 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 2d077f865d..d5f5f5b866 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 dfc8f3b7a1..ce4119d0ff 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 00ee1df36e..2b47f75340 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 49913991f8..4357922341 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 b0aaa45292..43de05972b 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 3e539073ce..d3da19651c 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 250340146c..082c294a3e 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 2b0a163dc5..32bd385ec8 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 dce5170463..56ceeb7141 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 4acc815e6f..87262d52aa 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 f63841d221..0330ebb3e8 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 b0e9eff55c..ab565e2518 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 baeb4b65ea..80e791784e 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 5976bb47c5..21ce3607ae 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 -- cgit v1.2.3