[igt-dev] [PATCH i-g-t 5/7] lib: fix aubdump dependency in autotools build

Lionel Landwerlin lionel.g.landwerlin at intel.com
Thu Jun 14 10:32:50 UTC 2018


In commit 1bb318b32db003a ("lib: create new dependency for aubdump")
we created a new dependency for the aubdump tool, so it doesn't pull
the whole of libigt into some other process' address space. This
previous change only dealt with meson and I forgot to modify the
autotools build.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
---
 lib/Makefile.am      | 8 +++++++-
 lib/Makefile.sources | 3 ---
 tools/Makefile.am    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ab9eefe6..ad3ed5fd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -11,7 +11,12 @@ libigt_perf_la_SOURCES = \
 	igt_perf.c	 \
 	igt_perf.h
 
-noinst_LTLIBRARIES = libintel_tools.la libigt_perf.la
+libigt_chipset_la_SOURCES = \
+	intel_chipset.c \
+	intel_chipset.h \
+	intel_device_info.c
+
+noinst_LTLIBRARIES = libintel_tools.la libigt_perf.la libigt_chipset.la
 noinst_HEADERS = check-ndebug.h
 
 if BUILD_VC4
@@ -77,6 +82,7 @@ AM_CFLAGS = \
 AM_CFLAGS += $(CAIRO_CFLAGS)
 
 libintel_tools_la_LIBADD = \
+	libigt_chipset.la \
 	$(DRM_LIBS) \
 	$(PCIACCESS_LIBS) \
 	$(PROCPS_LIBS) \
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index 042c1d3b..a786e256 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -50,9 +50,6 @@ lib_source_list =	 	\
 	intel_aub.h		\
 	intel_batchbuffer.c	\
 	intel_batchbuffer.h	\
-	intel_chipset.c		\
-	intel_chipset.h		\
-	intel_device_info.c	\
 	intel_os.c		\
 	intel_io.h		\
 	intel_mmio.c		\
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a0b016dd..c291dfa8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -26,7 +26,7 @@ module_LTLIBRARIES = intel_aubdump.la
 moduledir = $(libdir)
 intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined
 intel_aubdump_la_SOURCES = aubdump.c
-intel_aubdump_la_LIBADD = $(top_builddir)/lib/libintel_tools.la -ldl
+intel_aubdump_la_LIBADD = $(top_builddir)/lib/libigt_chipset.la -ldl
 
 intel_gpu_top_LDADD = $(top_builddir)/lib/libigt_perf.la
 
-- 
2.17.1



More information about the igt-dev mailing list