pipe-loader: consolidate sources into Makefile.sources
authorEmil Velikov <emil.l.velikov@gmail.com>
Tue, 14 Oct 2014 16:44:12 +0000 (17:44 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sun, 16 Nov 2014 01:03:42 +0000 (01:03 +0000)
Drop the unneeded subdir-objects.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
src/gallium/auxiliary/pipe-loader/Makefile.am
src/gallium/auxiliary/pipe-loader/Makefile.sources [new file with mode: 0644]

index 1204c79e13449e5e50a67900f7496d73b98a80f7..44917f37a4d9b5be5bdec7611beb3831a8326603 100644 (file)
@@ -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 (file)
index 0000000..d6e3c2c
--- /dev/null
@@ -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