summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-10-14 17:44:12 +0100
committerEmil Velikov <[email protected]>2014-11-16 01:03:42 +0000
commitdfa61dc37e2aa497279030321eb8c7d539d68c79 (patch)
treed30808e6f176b0543e4d7fd4b827d8e76b362dfa /src
parent631090e1557437faa89f4dfd452a194241707363 (diff)
pipe-loader: consolidate sources into Makefile.sources
Drop the unneeded subdir-objects. Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/pipe-loader/Makefile.am10
-rw-r--r--src/gallium/auxiliary/pipe-loader/Makefile.sources8
2 files changed, 10 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am
index 1204c79e134..44917f37a4d 100644
--- a/src/gallium/auxiliary/pipe-loader/Makefile.am
+++ b/src/gallium/auxiliary/pipe-loader/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = subdir-objects
+include Makefile.sources
AM_CPPFLAGS = $(DEFINES) \
$(VISIBILITY_CFLAGS) \
@@ -11,16 +11,10 @@ AM_CPPFLAGS = $(DEFINES) \
noinst_LTLIBRARIES = libpipe_loader.la
noinst_LTLIBRARIES += libpipe_loader_client.la
-COMMON_SOURCES = \
- pipe_loader.h \
- pipe_loader_priv.h \
- pipe_loader.c \
- pipe_loader_sw.c
-
if HAVE_DRM_LOADER_GALLIUM
AM_CFLAGS = $(LIBDRM_CFLAGS)
-COMMON_SOURCES += pipe_loader_drm.c
+COMMON_SOURCES += $(DRM_SOURCES)
COMMON_LIBADD = \
$(top_builddir)/src/loader/libloader.la
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.sources b/src/gallium/auxiliary/pipe-loader/Makefile.sources
new file mode 100644
index 00000000000..d6e3c2c060a
--- /dev/null
+++ b/src/gallium/auxiliary/pipe-loader/Makefile.sources
@@ -0,0 +1,8 @@
+COMMON_SOURCES := \
+ pipe_loader.c \
+ pipe_loader.h \
+ pipe_loader_priv.h \
+ pipe_loader_sw.c
+
+DRM_SOURCES := \
+ pipe_loader_drm.c