nvc0: move nvc0_validate_global_residents() to nvc0_compute.c

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

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 765fdd2a17d956640e6aeb72e954e97b700aea27..6fe2e22fecfdc5996aee293f12bfb9fd62030997 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,24 +11,30 @@ 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_VIDEO_CFLAGS = \
+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 \
@@ -37,9 +44,32 @@ GALLIUM_VIDEO_CFLAGS = \
        $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 
-GALLIUM_VDPAU_LINKER_FLAGS = \
-       -module \
-       -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
-       -export-symbols-regex $(VDPAU_EXPORTS) \
-       -shared \
-       -no-undefined
+GALLIUM_COMMON_LIB_DEPS = \
+       -lm \
+       $(CLOCK_LIB) \
+       $(PTHREAD_LIBS) \
+       $(DLOPEN_LIBS)
+
+GALLIUM_WINSYS_CFLAGS = \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       $(DEFINES) \
+       $(VISIBILITY_CFLAGS)
+
+
+GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
+       $(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 HAVE_DRISW_KMS
+GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
+       $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la \
+       $(LIBDRM_LIBS)
+endif