ilo: offset to layers only when necessary

[mesa.git] / src / gallium / Automake.inc

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index fabc2af9a16ce4fe690ff5c0aeda0ec104663700..1e4a34f5d2d7d8f9a2974afb829e325d2a0ca280 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -3,3 +3,90 @@ GALLIUM_CFLAGS = \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        $(DEFINES)
+
+# src/gallium/auxiliary must appear before src/gallium/drivers
+# because there are stupidly two rbug_context.h files in
+# different directories, and which one is included by the
+# preprocessor is determined by the ordering of the -I flags.
+GALLIUM_DRIVER_CFLAGS = \
+       -I$(srcdir)/include \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       -I$(top_srcdir)/src/gallium/drivers \
+       $(DEFINES) \
+       $(VISIBILITY_CFLAGS)
+
+GALLIUM_DRIVER_CXXFLAGS = \
+       -I$(srcdir)/include \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       -I$(top_srcdir)/src/gallium/drivers \
+       $(DEFINES) \
+       $(VISIBILITY_CXXFLAGS)
+
+GALLIUM_DRI_CFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/src/gallium/winsys \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src/mapi \
+       $(DEFINES) \
+       $(PTHREAD_CFLAGS) \
+       $(LIBDRM_CFLAGS) \
+       $(VISIBILITY_CFLAGS)
+
+GALLIUM_VIDEO_CFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/src/gallium/winsys \
+       $(DEFINES) \
+       $(PTHREAD_CFLAGS) \
+       $(LIBDRM_CFLAGS) \
+       $(VISIBILITY_CFLAGS)
+
+
+# TODO: add -export-symbols-regex
+GALLIUM_DRI_LINKER_FLAGS = \
+       -module \
+       -avoid-version \
+       -shared \
+       -Wl,-Bsymbolic
+
+GALLIUM_VDPAU_LINKER_FLAGS = \
+       -module \
+       -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
+       -export-symbols-regex $(VDPAU_EXPORTS) \
+       -shared \
+       -no-undefined
+
+GALLIUM_XVMC_LINKER_FLAGS = \
+       -module \
+       -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
+       -shared \
+       -export-symbols-regex '^XvMC' \
+       -no-undefined
+
+GALLIUM_VDPAU_LIB_DEPS = \
+       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+       $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
+       $(VDPAU_LIBS) \
+       $(LIBDRM_LIBS)
+
+GALLIUM_XVMC_LIB_DEPS = \
+       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+       $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
+       $(XVMC_LIBS) \
+       $(LIBDRM_LIBS)
+
+GALLIUM_WINSYS_CFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       $(DEFINES) \
+       $(VISIBILITY_CFLAGS)