From: Jason Ekstrand <jason.ekstr...@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
---
configure.ac | 1 -
src/Makefile.am | 4 --
src/intel/Makefile.am | 2 +
src/intel/{tools/Makefile.am => Makefile.tools.am} | 54 +++++++---------------
4 files changed, 19 insertions(+), 42 deletions(-)
rename src/intel/{tools/Makefile.am => Makefile.tools.am} (58%)
diff --git a/configure.ac b/configure.ac
index 19a9cdd007..5ab906898a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2687,7 +2687,6 @@ AC_CONFIG_FILES([Makefile
src/glx/windows/windowsdriproto.pc
src/gtest/Makefile
src/intel/Makefile
- src/intel/tools/Makefile
src/intel/vulkan/Makefile
src/loader/Makefile
src/mapi/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 25b9253fc3..01e9edfc48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,10 +117,6 @@ if HAVE_EGL
SUBDIRS += egl
endif
-if HAVE_INTEL_DRIVERS
-SUBDIRS += intel/tools
-endif
-
## Requires the i965 compiler (part of mesa) and wayland-drm
if HAVE_INTEL_VULKAN
SUBDIRS += intel/vulkan
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 8d852a09c9..fc749bfc95 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -49,6 +49,7 @@ MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
noinst_LTLIBRARIES =
+noinst_PROGRAMS =
check_PROGRAMS =
TESTS =
BUILT_SOURCES =
@@ -60,5 +61,6 @@ include Makefile.common.am
include Makefile.compiler.am
include Makefile.genxml.am
include Makefile.isl.am
+include Makefile.tools.am
CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/intel/tools/Makefile.am b/src/intel/Makefile.tools.am
similarity index 58%
rename from src/intel/tools/Makefile.am
rename to src/intel/Makefile.tools.am
index 3ef4f31ade..5838819f25 100644
--- a/src/intel/tools/Makefile.am
+++ b/src/intel/Makefile.tools.am
@@ -1,4 +1,4 @@
-# Copyright © 2016 Intel Corporation
+# Copyright 2015-2017 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -19,45 +19,25 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-# The gallium includes are for the util/u_math.h include from main/macros.h
-AM_CPPFLAGS = \
- $(INTEL_CFLAGS) \
- $(VALGRIND_CFLAGS) \
- $(DEFINES) \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/mapi \
- -I$(top_srcdir)/src/mesa \
- -I$(top_srcdir)/src/gallium/auxiliary \
- -I$(top_srcdir)/src/gallium/include \
- -I$(top_builddir)/src/intel \
- -I$(top_srcdir)/src/intel
+noinst_PROGRAMS += tools/aubinator
-aubinator_DEPS = \
- $(top_builddir)/src/intel/common/libintel_common.la \
- $(top_builddir)/src/intel/compiler/libintel_compiler.la \
+tools_aubinator_SOURCES = \
+ tools/aubinator.c \
+ tools/decoder.c \
+ tools/decoder.h \
+ tools/disasm.c \
+ tools/gen_disasm.h
+
+tools_aubinator_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(EXPAT_CFLAGS)
+
+tools_aubinator_LDADD = \
+ common/libintel_common.la \
+ compiler/libintel_compiler.la \
$(top_builddir)/src/util/libmesautil.la \
$(PER_GEN_LIBS) \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS) \
+ $(EXPAT_LIBS) \
-lm
-
-noinst_PROGRAMS = aubinator
-
-aubinator_SOURCES = \
- aubinator.c \
- decoder.c \
- decoder.h \
- disasm.c \
- gen_disasm.h
-
-aubinator_LDADD = \
- $(aubinator_DEPS) \
- $(EXPAT_LIBS)
-
-aubinator_CFLAGS = \
- $(AM_CFLAGS) \
- $(EXPAT_CFLAGS) \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src
--
2.11.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
