--- amdgpu/Makefile.am | 18 ++++-------------- amdgpu/Makefile.sources | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 amdgpu/Makefile.sources
diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am index ed97803..37f7198 100644 --- a/amdgpu/Makefile.am +++ b/amdgpu/Makefile.am @@ -22,6 +22,8 @@ # Authors: # Jérôme Glisse glisse@freedesktop.org
+include Makefile.sources + AM_CFLAGS = \ $(WARN_CFLAGS) -Wno-switch-enum \ -I$(top_srcdir) \ @@ -33,22 +35,10 @@ libdrm_amdgpu_ladir = $(libdir) libdrm_amdgpu_la_LDFLAGS = -version-number 1:0:0 -no-undefined libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-libdrm_amdgpu_la_SOURCES = \ - amdgpu.h \ - amdgpu_bo.c \ - amdgpu_cs.c \ - amdgpu_device.c \ - amdgpu_gpu_info.c \ - amdgpu_internal.h \ - amdgpu_vamgr.c \ - util_hash.c \ - util_hash.h \ - util_hash_table.c \ - util_hash_table.h +libdrm_amdgpu_la_SOURCES = $(LIBDRM_AMDGPU_FILES)
libdrm_amdgpuincludedir = ${includedir}/libdrm -libdrm_amdgpuinclude_HEADERS = \ - amdgpu.h +libdrm_amdgpuinclude_HEADERS = $(LIBDRM_AMDGPU_H_FILES)
pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_amdgpu.pc diff --git a/amdgpu/Makefile.sources b/amdgpu/Makefile.sources new file mode 100644 index 0000000..c359f17 --- /dev/null +++ b/amdgpu/Makefile.sources @@ -0,0 +1,15 @@ +LIBDRM_AMDGPU_FILES := \ + amdgpu.h \ + amdgpu_bo.c \ + amdgpu_cs.c \ + amdgpu_device.c \ + amdgpu_gpu_info.c \ + amdgpu_internal.h \ + amdgpu_vamgr.c \ + util_hash.c \ + util_hash.h \ + util_hash_table.c \ + util_hash_table.h + +LIBDRM_AMDGPU_H_FILES := \ + amdgpu.h
--- amdgpu/Android.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 amdgpu/Android.mk
diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk new file mode 100644 index 0000000..469df1b --- /dev/null +++ b/amdgpu/Android.mk @@ -0,0 +1,18 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +# Import variables LIBDRM_AMDGPU_FILES, LIBDRM_AMDGPU_H_FILES +include $(LOCAL_PATH)/Makefile.sources + +LOCAL_MODULE := libdrm_amdgpu +LOCAL_MODULE_TAGS := optional + +LOCAL_SHARED_LIBRARIES := libdrm + +LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) + +LOCAL_CFLAGS := \ + -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 + +include $(BUILD_SHARED_LIBRARY)
On Tue, Aug 18, 2015 at 5:43 AM, Mauro Rossi issor.oruam@gmail.com wrote:
amdgpu/Makefile.am | 18 ++++-------------- amdgpu/Makefile.sources | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 amdgpu/Makefile.sources
For the series: Reviewed-by: Alex Deucher alexander.deucher@amd.com
diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am index ed97803..37f7198 100644 --- a/amdgpu/Makefile.am +++ b/amdgpu/Makefile.am @@ -22,6 +22,8 @@ # Authors: # Jérôme Glisse glisse@freedesktop.org
+include Makefile.sources
AM_CFLAGS = \ $(WARN_CFLAGS) -Wno-switch-enum \ -I$(top_srcdir) \ @@ -33,22 +35,10 @@ libdrm_amdgpu_ladir = $(libdir) libdrm_amdgpu_la_LDFLAGS = -version-number 1:0:0 -no-undefined libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-libdrm_amdgpu_la_SOURCES = \
amdgpu.h \amdgpu_bo.c \amdgpu_cs.c \amdgpu_device.c \amdgpu_gpu_info.c \amdgpu_internal.h \amdgpu_vamgr.c \util_hash.c \util_hash.h \util_hash_table.c \util_hash_table.h+libdrm_amdgpu_la_SOURCES = $(LIBDRM_AMDGPU_FILES)
libdrm_amdgpuincludedir = ${includedir}/libdrm -libdrm_amdgpuinclude_HEADERS = \
amdgpu.h+libdrm_amdgpuinclude_HEADERS = $(LIBDRM_AMDGPU_H_FILES)
pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_amdgpu.pc diff --git a/amdgpu/Makefile.sources b/amdgpu/Makefile.sources new file mode 100644 index 0000000..c359f17 --- /dev/null +++ b/amdgpu/Makefile.sources @@ -0,0 +1,15 @@ +LIBDRM_AMDGPU_FILES := \
amdgpu.h \amdgpu_bo.c \amdgpu_cs.c \amdgpu_device.c \amdgpu_gpu_info.c \amdgpu_internal.h \amdgpu_vamgr.c \util_hash.c \util_hash.h \util_hash_table.c \util_hash_table.h+LIBDRM_AMDGPU_H_FILES := \
amdgpu.h-- 2.1.4
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
Seems like git send-email went awol when formatting this, and git am wasn't able to pick it up :(
On the good side, I've noticed that we can/should drop amdgpu.h from the LIBDRM_AMDGPU_FILES list. So I've amended that and pushed these two.
Thank you Mauro. Emil
Seems like git send-email went awol when formatting this, and git am wasn't able to pick it up :(
On the good side, I've noticed that we can/should drop amdgpu.h from the LIBDRM_AMDGPU_FILES list. So I've amended that and pushed these two.
Thank you Mauro. Emil
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Emil Velikov -
Mauro Rossi