[Mesa-dev] [PATCH 21/22] automake: fold VISIBILITY_CFLAGS within DEFINES
Emil Velikov
emil.l.velikov at gmail.com
Sat Feb 8 08:04:06 PST 2014
Most places in mesa requires explicit VISIBILITY_CFLAGS causing
some headache when introducing new build components and managing
existing ones. Move to inconditionally hide all symbols and make
sure we explicitly set the ones that need to be public.
XXX: The following needs to be checked/tested
src/gtest/
src/mapi/glapi
src/mapi/shared-glapi/
src/gallium/state_trackers/vega/
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
configure.ac | 2 ++
src/egl/drivers/dri2/Makefile.am | 1 -
src/egl/main/Makefile.am | 1 -
src/egl/wayland/wayland-drm/Makefile.am | 1 -
src/egl/wayland/wayland-egl/Makefile.am | 1 -
src/gallium/Automake.inc | 15 +++++----------
src/gallium/auxiliary/Makefile.am | 3 +--
src/gallium/auxiliary/pipe-loader/Makefile.am | 1 -
src/gallium/state_trackers/dri/drm/Makefile.am | 3 +--
src/gallium/state_trackers/dri/sw/Makefile.am | 1 -
src/gallium/state_trackers/egl/Makefile.am | 1 -
src/gallium/state_trackers/gbm/Makefile.am | 3 +--
src/gallium/state_trackers/omx/Makefile.am | 1 -
src/gallium/state_trackers/vdpau/Makefile.am | 1 -
src/gallium/state_trackers/xa/Makefile.am | 3 +--
src/gallium/targets/egl-static/Makefile.am | 1 -
src/gallium/targets/gbm/Makefile.am | 1 -
src/gallium/targets/r600/omx/Makefile.am | 1 -
src/gallium/targets/radeonsi/omx/Makefile.am | 1 -
src/gbm/Makefile.am | 3 +--
src/glx/Makefile.am | 1 -
src/loader/Makefile.am | 1 -
src/mapi/es1api/Makefile.am | 2 --
src/mapi/es2api/Makefile.am | 2 --
src/mapi/vgapi/Makefile.am | 2 --
src/mesa/drivers/dri/common/Makefile.am | 3 +--
src/mesa/drivers/dri/i915/Makefile.am | 1 -
src/mesa/drivers/dri/i965/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 | 3 +--
src/mesa/drivers/osmesa/Makefile.am | 2 --
33 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/configure.ac b/configure.ac
index 56d5c8e..02a8699 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,6 +227,8 @@ cygwin*)
;;
esac
+DEFINES="$DEFINES $VISIBILITY_CFLAGS"
+
AC_SUBST([VISIBILITY_CFLAGS])
AC_SUBST([VISIBILITY_CXXFLAGS])
diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am
index 6a9ae50..89be47b 100644
--- a/src/egl/drivers/dri2/Makefile.am
+++ b/src/egl/drivers/dri2/Makefile.am
@@ -29,7 +29,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/egl/wayland/wayland-drm \
-I$(top_builddir)/src/egl/wayland/wayland-drm \
$(DEFINES) \
- $(VISIBILITY_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(LIBUDEV_CFLAGS) \
$(LIBKMS_CFLAGS) \
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 7d9748f..a0b9e8f 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -27,7 +27,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gbm/main \
$(DEFINES) \
- $(VISIBILITY_CFLAGS) \
$(EGL_CFLAGS) \
-D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
-D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \
diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am
index 08ee497..4b2aeb3 100644
--- a/src/egl/wayland/wayland-drm/Makefile.am
+++ b/src/egl/wayland/wayland-drm/Makefile.am
@@ -1,7 +1,6 @@
AM_CFLAGS = -I$(top_srcdir)/src/egl/main \
-I$(top_srcdir)/include \
$(DEFINES) \
- $(VISIBILITY_CFLAGS) \
$(WAYLAND_CFLAGS)
noinst_LTLIBRARIES = libwayland-drm.la
diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am
index 6e92b29..5164950 100644
--- a/src/egl/wayland/wayland-egl/Makefile.am
+++ b/src/egl/wayland/wayland-egl/Makefile.am
@@ -2,7 +2,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wayland-egl.pc
AM_CFLAGS = $(DEFINES) \
- $(VISIBILITY_CFLAGS) \
$(WAYLAND_CFLAGS)
lib_LTLIBRARIES = libwayland-egl.la
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index c67b612..4c4bf58 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -14,8 +14,7 @@ GALLIUM_DRIVER_CFLAGS = \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
- $(DEFINES) \
- $(VISIBILITY_CFLAGS)
+ $(DEFINES)
GALLIUM_DRIVER_CXXFLAGS = \
-I$(srcdir)/include \
@@ -23,8 +22,7 @@ GALLIUM_DRIVER_CXXFLAGS = \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
- $(DEFINES) \
- $(VISIBILITY_CXXFLAGS)
+ $(DEFINES)
GALLIUM_DRI_CFLAGS = \
-I$(top_srcdir)/include \
@@ -36,8 +34,7 @@ GALLIUM_DRI_CFLAGS = \
-I$(top_srcdir)/src/mapi \
$(DEFINES) \
$(PTHREAD_CFLAGS) \
- $(LIBDRM_CFLAGS) \
- $(VISIBILITY_CFLAGS)
+ $(LIBDRM_CFLAGS)
GALLIUM_VIDEO_CFLAGS = \
-I$(top_srcdir)/include \
@@ -47,8 +44,7 @@ GALLIUM_VIDEO_CFLAGS = \
-I$(top_srcdir)/src/gallium/winsys \
$(DEFINES) \
$(PTHREAD_CFLAGS) \
- $(LIBDRM_CFLAGS) \
- $(VISIBILITY_CFLAGS)
+ $(LIBDRM_CFLAGS)
GALLIUM_DRI_LINKER_FLAGS = \
@@ -85,5 +81,4 @@ GALLIUM_WINSYS_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
- $(DEFINES) \
- $(VISIBILITY_CFLAGS)
+ $(DEFINES)
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 2d2d8d4..e95787c 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -7,8 +7,7 @@ noinst_LTLIBRARIES = libgallium.la
AM_CFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary/util \
- $(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS)
+ $(GALLIUM_CFLAGS)
AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am
index 74a61a3..8e4d034 100644
--- a/src/gallium/auxiliary/pipe-loader/Makefile.am
+++ b/src/gallium/auxiliary/pipe-loader/Makefile.am
@@ -1,7 +1,6 @@
AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = $(DEFINES) \
- $(VISIBILITY_CFLAGS) \
$(GALLIUM_PIPE_LOADER_DEFINES) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/loader \
diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am b/src/gallium/state_trackers/dri/drm/Makefile.am
index f41f45d..c90c463 100644
--- a/src/gallium/state_trackers/dri/drm/Makefile.am
+++ b/src/gallium/state_trackers/dri/drm/Makefile.am
@@ -31,8 +31,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(GALLIUM_CFLAGS) \
- $(LIBDRM_CFLAGS) \
- $(VISIBILITY_CFLAGS)
+ $(LIBDRM_CFLAGS)
noinst_LTLIBRARIES = libdridrm.la
diff --git a/src/gallium/state_trackers/dri/sw/Makefile.am b/src/gallium/state_trackers/dri/sw/Makefile.am
index 555ea17..f0377a8 100644
--- a/src/gallium/state_trackers/dri/sw/Makefile.am
+++ b/src/gallium/state_trackers/dri/sw/Makefile.am
@@ -31,7 +31,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(GALLIUM_CFLAGS) \
$(LIBDRM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
-D__NOT_HAVE_DRM_H
noinst_LTLIBRARIES = libdrisw.la
diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
index 9c00f06..bad14fe 100644
--- a/src/gallium/state_trackers/egl/Makefile.am
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -27,7 +27,6 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = $(GALLIUM_CFLAGS)
AM_CPPFLAGS = \
- $(VISIBILITY_CFLAGS) \
-I$(top_srcdir)/src/egl/main \
-I$(top_builddir)/src/egl/wayland/wayland-drm/ \
-I$(top_srcdir)/include
diff --git a/src/gallium/state_trackers/gbm/Makefile.am b/src/gallium/state_trackers/gbm/Makefile.am
index 0e532fd..cebc2f9 100644
--- a/src/gallium/state_trackers/gbm/Makefile.am
+++ b/src/gallium/state_trackers/gbm/Makefile.am
@@ -24,8 +24,7 @@ include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
- $(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS)
+ $(GALLIUM_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/src/gbm/main \
-I$(top_srcdir)/include
diff --git a/src/gallium/state_trackers/omx/Makefile.am b/src/gallium/state_trackers/omx/Makefile.am
index 7972d79..1983248 100644
--- a/src/gallium/state_trackers/omx/Makefile.am
+++ b/src/gallium/state_trackers/omx/Makefile.am
@@ -24,7 +24,6 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
$(OMX_CFLAGS)
noinst_LTLIBRARIES = libomxtracker.la
diff --git a/src/gallium/state_trackers/vdpau/Makefile.am b/src/gallium/state_trackers/vdpau/Makefile.am
index a74b5bf..a2fa366 100644
--- a/src/gallium/state_trackers/vdpau/Makefile.am
+++ b/src/gallium/state_trackers/vdpau/Makefile.am
@@ -28,7 +28,6 @@ VDPAU_MINOR = 0
AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
$(VDPAU_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
diff --git a/src/gallium/state_trackers/xa/Makefile.am b/src/gallium/state_trackers/xa/Makefile.am
index 7d0b366..8cf0a90 100644
--- a/src/gallium/state_trackers/xa/Makefile.am
+++ b/src/gallium/state_trackers/xa/Makefile.am
@@ -25,8 +25,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
-Wall -pedantic \
- $(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS)
+ $(GALLIUM_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/ \
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 273d364..b8b50fb 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -33,7 +33,6 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS = \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/loader \
-I$(top_srcdir)/src/gallium/drivers \
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am
index 89e1023..b4e2bd5 100644
--- a/src/gallium/targets/gbm/Makefile.am
+++ b/src/gallium/targets/gbm/Makefile.am
@@ -34,7 +34,6 @@ AM_CPPFLAGS = \
AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
$(LIBUDEV_CFLAGS) \
$(LIBDRM_CFLAGS)
diff --git a/src/gallium/targets/r600/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am
index 3a1e22b..b46c35a 100644
--- a/src/gallium/targets/r600/omx/Makefile.am
+++ b/src/gallium/targets/r600/omx/Makefile.am
@@ -24,7 +24,6 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(LIBDRM_CFLAGS)
AM_CPPFLAGS = \
diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am
index 79ed287..efc317e 100644
--- a/src/gallium/targets/radeonsi/omx/Makefile.am
+++ b/src/gallium/targets/radeonsi/omx/Makefile.am
@@ -24,7 +24,6 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(LIBDRM_CFLAGS)
AM_CPPFLAGS = \
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 8503242..0d42dfa 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -12,8 +12,7 @@ AM_CFLAGS = \
$(LIBUDEV_CFLAGS) \
$(LIBKMS_CFLAGS) \
$(DLOPEN_CFLAGS) \
- $(DEFINES) \
- $(VISIBILITY_CFLAGS)
+ $(DEFINES)
lib_LTLIBRARIES = libgbm.la
include_HEADERS = main/gbm.h
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index c8dfb86..69838bd 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -40,7 +40,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mapi/glapi \
-I$(top_builddir)/src/mapi \
-I$(top_builddir)/src/mapi/glapi \
- $(VISIBILITY_CFLAGS) \
$(SHARED_GLAPI_CFLAGS) \
$(EXTRA_DEFINES_XF86VIDMODE) \
-D_REENTRANT \
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index bddf7ac..bf23b5a 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -26,7 +26,6 @@ noinst_LTLIBRARIES = libloader.la
libloader_la_CPPFLAGS = \
$(DEFINES) \
-I$(top_srcdir)/include \
- $(VISIBILITY_CFLAGS) \
$(LIBUDEV_CFLAGS)
if !HAVE_LIBDRM
diff --git a/src/mapi/es1api/Makefile.am b/src/mapi/es1api/Makefile.am
index b61f9cb..702ed91 100644
--- a/src/mapi/es1api/Makefile.am
+++ b/src/mapi/es1api/Makefile.am
@@ -26,8 +26,6 @@ AM_CPPFLAGS = \
-DMAPI_MODE_BRIDGE \
-DMAPI_ABI_HEADER=\"glapi_mapi_tmp.h\"
-AM_CFLAGS = $(VISIBILITY_CFLAGS)
-
TESTS = ABI-check
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/mapi/es2api/Makefile.am b/src/mapi/es2api/Makefile.am
index a944493..1a51114 100644
--- a/src/mapi/es2api/Makefile.am
+++ b/src/mapi/es2api/Makefile.am
@@ -26,8 +26,6 @@ AM_CPPFLAGS = \
-DMAPI_MODE_BRIDGE \
-DMAPI_ABI_HEADER=\"glapi_mapi_tmp.h\"
-AM_CFLAGS = $(VISIBILITY_CFLAGS)
-
TESTS = ABI-check
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am
index 8952df0..437b2db 100644
--- a/src/mapi/vgapi/Makefile.am
+++ b/src/mapi/vgapi/Makefile.am
@@ -25,8 +25,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mapi \
-DMAPI_ABI_HEADER=\"vgapi_tmp.h\"
-AM_CFLAGS = $(VISIBILITY_CFLAGS)
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = vg.pc
diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
index e500bdb..e92f078 100644
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ b/src/mesa/drivers/dri/common/Makefile.am
@@ -29,8 +29,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
$(DEFINES) \
- $(EXPAT_CFLAGS) \
- $(VISIBILITY_CFLAGS)
+ $(EXPAT_CFLAGS)
noinst_LTLIBRARIES = \
libdricommon.la \
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index ac49360..f605278 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -32,7 +32,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
- $(VISIBILITY_CFLAGS) \
$(INTEL_CFLAGS)
noinst_LTLIBRARIES = libi915_dri.la
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 24e226f..13299e9 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -33,7 +33,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/gtest/include \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
- $(VISIBILITY_CFLAGS) \
$(INTEL_CFLAGS)
AM_CXXFLAGS = $(AM_CFLAGS)
diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index 377b9a2..35afcff 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) \
- $(VISIBILITY_CFLAGS) \
$(NOUVEAU_CFLAGS)
noinst_LTLIBRARIES = libnouveau_dri.la
diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
index 3a31fcb..4919fe3 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) \
- $(VISIBILITY_CFLAGS) \
$(RADEON_CFLAGS)
noinst_LTLIBRARIES = libr200_dri.la
diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
index 26bfbc1..76ec4ca 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) \
- $(VISIBILITY_CFLAGS) \
$(RADEON_CFLAGS)
noinst_LTLIBRARIES = libradeon_dri.la
diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
index 0837b45..f3944cb 100644
--- a/src/mesa/drivers/dri/swrast/Makefile.am
+++ b/src/mesa/drivers/dri/swrast/Makefile.am
@@ -31,8 +31,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_builddir)/src/mesa/drivers/dri/common \
- $(DEFINES) \
- $(VISIBILITY_CFLAGS)
+ $(DEFINES)
noinst_LTLIBRARIES = libswrast_dri.la
libswrast_dri_la_SOURCES = $(SWRAST_C_FILES)
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 4935335..a590e15 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -27,8 +27,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
$(DEFINES)
-AM_CFLAGS = $(PTHREAD_CFLAGS) \
- $(VISIBILITY_CFLAGS)
lib_LTLIBRARIES = lib at OSMESA_LIB@.la
--
1.8.5.2
More information about the mesa-dev
mailing list