X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FAutomake.inc;h=3e21aa71b5ca10c8374a6b95fc462f71e7b9a8b5;hb=b923f21eaadb77ee70e1bf4c5e2f9aee2a5fa205;hp=95aae50d64b87fedb9957108ea4e53170fccc860;hpb=ccad3829e3e6e25b7d7ae746d17b88d51a70660c;p=mesa.git diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index 95aae50d64b..3e21aa71b5c 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -39,6 +39,8 @@ GALLIUM_TARGET_CFLAGS = \ -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) \ @@ -46,10 +48,17 @@ 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 \ @@ -68,9 +77,8 @@ 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