llvmpipe: s/unsigned/enum pipe_shader_type/

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

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index fec69cc523f99507b7542c61509b593be887c0cf..a01fa54053149372a32ff50eed546490170b7cb2 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,85 +11,71 @@ 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_DRI_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 \
        -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 = \
+GALLIUM_COMMON_LIB_DEPS = \
+       -lm \
+       $(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 \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
        $(DEFINES) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 
 
-DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link
-
-GALLIUM_DRI_LINKER_FLAGS = \
-       -module \
-       -avoid-version \
-       -Wl,--version-script=$(DRI_VERSION_SCRIPT) \
-       -shared \
-       -no-undefined
+GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
+       $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
+       $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la
 
-GALLIUM_VDPAU_LINKER_FLAGS = \
-       -module \
-       -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
-       -export-symbols-regex $(VDPAU_EXPORTS) \
-       -shared \
-       -no-undefined
+if HAVE_DRISW
+GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
+       $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
+endif
 
-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) \
+if HAVE_DRISW_KMS
+GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
+       $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la \
        $(LIBDRM_LIBS)
-
-GALLIUM_WINSYS_CFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src/gallium/include \
-       -I$(top_srcdir)/src/gallium/auxiliary \
-       $(DEFINES) \
-       $(VISIBILITY_CFLAGS)
+endif