etnaviv: add resource subregion copy

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

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 73d65a4d10fecc57c6aba563c46ce5cc798ff335..3e21aa71b5ca10c8374a6b95fc462f71e7b9a8b5 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -1,5 +1,6 @@
 GALLIUM_CFLAGS = \
        -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        $(DEFINES)
@@ -10,29 +11,36 @@ GALLIUM_CFLAGS = \
 # preprocessor is determined by the ordering of the -I flags.
 GALLIUM_DRIVER_CFLAGS = \
        -I$(srcdir)/include \
+       -I$(top_srcdir)/src \
        -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) \
        $(VISIBILITY_CFLAGS)
 
 GALLIUM_DRIVER_CXXFLAGS = \
        -I$(srcdir)/include \
+       -I$(top_srcdir)/src \
        -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) \
        $(VISIBILITY_CXXFLAGS)
 
 GALLIUM_TARGET_CFLAGS = \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/loader \
        -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_builddir)/src/util/ \
+       -I$(top_builddir)/src/gallium/drivers/ \
        $(DEFINES) \
        $(PTHREAD_CFLAGS) \
        $(LIBDRM_CFLAGS) \
@@ -40,11 +48,19 @@ GALLIUM_TARGET_CFLAGS = \
 
 GALLIUM_COMMON_LIB_DEPS = \
        -lm \
+       $(LIBUNWIND_LIBS) \
+       $(LIBSENSORS_LIBS) \
        $(CLOCK_LIB) \
        $(PTHREAD_LIBS) \
        $(DLOPEN_LIBS)
 
+if HAVE_LIBDRM
+GALLIUM_COMMON_LIB_DEPS += \
+       $(LIBDRM_LIBS)
+endif
+
 GALLIUM_WINSYS_CFLAGS = \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
@@ -53,16 +69,16 @@ GALLIUM_WINSYS_CFLAGS = \
 
 
 GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
-       $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la
+       $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
+       $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la
 
 if HAVE_DRISW
 GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
        $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
 endif
 
-if NEED_WINSYS_XLIB
+if HAVE_DRISW_KMS
 GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
-       $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
-       -lX11 -lXext -lXfixes \
+       $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la \
        $(LIBDRM_LIBS)
 endif