diff options
author | Maarten Lankhorst <m.b.lankhorst@gmail.com> | 2013-02-21 18:07:52 +0100 |
---|---|---|
committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-03-16 12:45:22 +0100 |
commit | f70c3853513637fa6ed38e75f73d472a9fa61213 (patch) | |
tree | 298c410ebddda27e1ccbbd29a744be6ebaa801db | |
parent | 49ae9b08d400fc99ef5e803bcd9a9adb600b252e (diff) |
gallium/build: Fix visibility CFLAGS in automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Fix formatting - use one CFLAG per line
NOTE: This is a candidate for the 9.1 branch.
Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59238
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
-rw-r--r-- | src/gallium/auxiliary/Makefile.am | 7 | ||||
-rw-r--r-- | src/gallium/drivers/rbug/Makefile.am | 1 | ||||
-rw-r--r-- | src/gallium/drivers/svga/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/drivers/trace/Makefile.am | 3 | ||||
-rw-r--r-- | src/gallium/state_trackers/xa/Makefile.am | 4 | ||||
-rw-r--r-- | src/gallium/winsys/svga/drm/Makefile.am | 2 |
6 files changed, 15 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index a4eee4773c2..f14279b4f91 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am | |||
@@ -7,7 +7,10 @@ noinst_LTLIBRARIES = libgallium.la | |||
7 | 7 | ||
8 | AM_CFLAGS = \ | 8 | AM_CFLAGS = \ |
9 | -I$(top_srcdir)/src/gallium/auxiliary/util \ | 9 | -I$(top_srcdir)/src/gallium/auxiliary/util \ |
10 | $(GALLIUM_CFLAGS) | 10 | $(GALLIUM_CFLAGS) \ |
11 | $(VISIBILITY_CFLAGS) | ||
12 | |||
13 | AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) | ||
11 | 14 | ||
12 | libgallium_la_SOURCES = \ | 15 | libgallium_la_SOURCES = \ |
13 | $(C_SOURCES) \ | 16 | $(C_SOURCES) \ |
@@ -18,7 +21,7 @@ if HAVE_MESA_LLVM | |||
18 | AM_CFLAGS += \ | 21 | AM_CFLAGS += \ |
19 | $(LLVM_CFLAGS) | 22 | $(LLVM_CFLAGS) |
20 | 23 | ||
21 | AM_CXXFLAGS = \ | 24 | AM_CXXFLAGS += \ |
22 | $(GALLIUM_CFLAGS) \ | 25 | $(GALLIUM_CFLAGS) \ |
23 | $(LLVM_CXXFLAGS) | 26 | $(LLVM_CXXFLAGS) |
24 | 27 | ||
diff --git a/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am index 655bfe1e40a..3c1a8b5f875 100644 --- a/src/gallium/drivers/rbug/Makefile.am +++ b/src/gallium/drivers/rbug/Makefile.am | |||
@@ -30,6 +30,7 @@ noinst_LTLIBRARIES = librbug.la | |||
30 | # preprocessor is determined by the ordering of the -I flags. | 30 | # preprocessor is determined by the ordering of the -I flags. |
31 | AM_CFLAGS = \ | 31 | AM_CFLAGS = \ |
32 | $(GALLIUM_CFLAGS) \ | 32 | $(GALLIUM_CFLAGS) \ |
33 | $(VISIBILITY_CFLAGS) \ | ||
33 | -I$(top_srcdir)/src/gallium/drivers \ | 34 | -I$(top_srcdir)/src/gallium/drivers \ |
34 | -I$(top_srcdir)/include | 35 | -I$(top_srcdir)/include |
35 | 36 | ||
diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am index fdaa3c8ebc4..7eacd90c0ec 100644 --- a/src/gallium/drivers/svga/Makefile.am +++ b/src/gallium/drivers/svga/Makefile.am | |||
@@ -29,6 +29,8 @@ AM_CPPFLAGS = \ | |||
29 | -I$(top_srcdir)/include \ | 29 | -I$(top_srcdir)/include \ |
30 | $(GALLIUM_CFLAGS) | 30 | $(GALLIUM_CFLAGS) |
31 | 31 | ||
32 | AM_CFLAGS = $(VISIBILITY_CFLAGS) | ||
33 | |||
32 | #On some systems -std= must be added to CFLAGS to be the last -std= | 34 | #On some systems -std= must be added to CFLAGS to be the last -std= |
33 | CFLAGS += -std=gnu99 | 35 | CFLAGS += -std=gnu99 |
34 | 36 | ||
diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am index a9e1457d33e..984ead4d7ab 100644 --- a/src/gallium/drivers/trace/Makefile.am +++ b/src/gallium/drivers/trace/Makefile.am | |||
@@ -1,7 +1,8 @@ | |||
1 | include $(top_srcdir)/src/gallium/Automake.inc | 1 | include $(top_srcdir)/src/gallium/Automake.inc |
2 | 2 | ||
3 | AM_CFLAGS = \ | 3 | AM_CFLAGS = \ |
4 | $(GALLIUM_CFLAGS) | 4 | $(GALLIUM_CFLAGS) \ |
5 | $(VISIBILITY_CFLAGS) | ||
5 | 6 | ||
6 | noinst_LTLIBRARIES = libtrace.la | 7 | noinst_LTLIBRARIES = libtrace.la |
7 | 8 | ||
diff --git a/src/gallium/state_trackers/xa/Makefile.am b/src/gallium/state_trackers/xa/Makefile.am index 5b53ef96f14..57d55c4a91e 100644 --- a/src/gallium/state_trackers/xa/Makefile.am +++ b/src/gallium/state_trackers/xa/Makefile.am | |||
@@ -24,7 +24,9 @@ include $(top_srcdir)/src/gallium/Automake.inc | |||
24 | 24 | ||
25 | AM_CFLAGS = \ | 25 | AM_CFLAGS = \ |
26 | -Wall -pedantic \ | 26 | -Wall -pedantic \ |
27 | $(GALLIUM_CFLAGS) | 27 | $(GALLIUM_CFLAGS) \ |
28 | $(VISIBILITY_CFLAGS) | ||
29 | |||
28 | AM_CPPFLAGS = \ | 30 | AM_CPPFLAGS = \ |
29 | -I$(top_srcdir)/src/gallium/ \ | 31 | -I$(top_srcdir)/src/gallium/ \ |
30 | -I$(top_srcdir)/src/gallium/winsys \ | 32 | -I$(top_srcdir)/src/gallium/winsys \ |
diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am index 53bbcc244fd..d7ada3c6b7a 100644 --- a/src/gallium/winsys/svga/drm/Makefile.am +++ b/src/gallium/winsys/svga/drm/Makefile.am | |||
@@ -31,6 +31,8 @@ AM_CPPFLAGS = \ | |||
31 | $(GALLIUM_CFLAGS) \ | 31 | $(GALLIUM_CFLAGS) \ |
32 | $(LIBDRM_CFLAGS) | 32 | $(LIBDRM_CFLAGS) |
33 | 33 | ||
34 | AM_CFLAGS = $(VISIBILITY_CFLAGS) | ||
35 | |||
34 | #On some systems -std= must be added to CFLAGS to be the last -std= | 36 | #On some systems -std= must be added to CFLAGS to be the last -std= |
35 | CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 | 37 | CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 |
36 | 38 | ||