gallium/ilo: cleanup intel_winsys.h

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

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 1a21cad01284bb64b2046f48cb109c04acb21676..74053eb2d8293911f0fdeb0c3a68e3302019f2dd 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,6 +11,7 @@ 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 \
@@ -19,6 +21,7 @@ GALLIUM_DRIVER_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 \
@@ -26,21 +29,6 @@ GALLIUM_DRIVER_CXXFLAGS = \
        $(DEFINES) \
        $(VISIBILITY_CXXFLAGS)
 
-GALLIUM_DRI_CFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src/gallium/state_trackers/dri/common \
-       -I$(top_srcdir)/src/mesa/drivers/dri/common \
-       -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_TARGET_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/loader \
@@ -53,35 +41,12 @@ GALLIUM_TARGET_CFLAGS = \
        $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 
-
-GALLIUM_DRI_LINKER_FLAGS = \
-       -shared \
-       -shrext .so \
-       -module \
-       -avoid-version \
-       $(GC_SECTIONS)
-
-if HAVE_LD_VERSION_SCRIPT
-GALLIUM_DRI_LINKER_FLAGS += \
-       -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri/dri.sym
-
-endif
-
-
 GALLIUM_COMMON_LIB_DEPS = \
        -lm \
        $(CLOCK_LIB) \
        $(PTHREAD_LIBS) \
        $(DLOPEN_LIBS)
 
-GALLIUM_DRI_LIB_DEPS = \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(SELINUX_LIBS) \
-       $(LIBDRM_LIBS) \
-       $(EXPAT_LIBS) \
-       $(GALLIUM_COMMON_LIB_DEPS)
-
 GALLIUM_WINSYS_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/include \
@@ -89,11 +54,6 @@ GALLIUM_WINSYS_CFLAGS = \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS)
 
-if HAVE_MESA_LLVM
-GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS)
-GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS)
-endif
-
 
 GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
        $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la