summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSooChan Lim <sc1.lim@samsung.com>2016-06-27 14:24:55 +0900
committerJoonyoung Shim <jy0922.shim@samsung.com>2017-02-15 13:37:34 +0900
commit0a57d961e0244a388ba7f6dc0e173af495d19a4b (patch)
treefb22ffe7fd85d1c7842ce68242d8049781809e56
parent8ce432a926313ea8e5f7714eda0df82c108cb1d8 (diff)
downloadlibdrm-0a57d961e0244a388ba7f6dc0e173af495d19a4b.tar.gz
libdrm-0a57d961e0244a388ba7f6dc0e173af495d19a4b.tar.bz2
libdrm-0a57d961e0244a388ba7f6dc0e173af495d19a4b.zip
remove the pthread-stub dependency
Change-Id: I9253557242bb43ec49e4f45eed5d21269bbbb3ac
-rw-r--r--amdgpu/Makefile.am3
-rw-r--r--configure.ac4
-rw-r--r--etnaviv/Makefile.am2
-rw-r--r--exynos/Makefile.am3
-rw-r--r--freedreno/Makefile.am2
-rw-r--r--intel/Makefile.am2
-rw-r--r--nouveau/Makefile.am3
-rw-r--r--omap/Makefile.am3
-rw-r--r--packaging/libdrm.spec2
-rw-r--r--radeon/Makefile.am3
-rw-r--r--tegra/Makefile.am3
-rw-r--r--vigs/Makefile.am3
12 files changed, 8 insertions, 25 deletions
diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am
index cf7bc1ba..cf13dbae 100644
--- a/amdgpu/Makefile.am
+++ b/amdgpu/Makefile.am
@@ -27,13 +27,12 @@ include Makefile.sources
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_amdgpu_la_LTLIBRARIES = libdrm_amdgpu.la
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_LIBADD = ../libdrm.la
libdrm_amdgpu_la_SOURCES = $(LIBDRM_AMDGPU_FILES)
diff --git a/configure.ac b/configure.ac
index 2aa4ff9b..35977f0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,10 +61,6 @@ LT_PREREQ([2.2])
LT_INIT([disable-static])
-
-AC_SUBST(PTHREADSTUBS_CFLAGS)
-AC_SUBST(PTHREADSTUBS_LIBS)
-
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
AC_ARG_ENABLE([udev],
diff --git a/etnaviv/Makefile.am b/etnaviv/Makefile.am
index be96ba86..01551bf5 100644
--- a/etnaviv/Makefile.am
+++ b/etnaviv/Makefile.am
@@ -3,7 +3,6 @@ include Makefile.sources
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_etnaviv_ladir = $(libdir)
@@ -11,7 +10,6 @@ libdrm_etnaviv_la_LTLIBRARIES = libdrm_etnaviv.la
libdrm_etnaviv_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libdrm_etnaviv_la_LIBADD = \
../libdrm.la \
- @PTHREADSTUBS_LIBS@ \
@CLOCK_LIB@
libdrm_etnaviv_la_SOURCES = $(LIBDRM_ETNAVIV_FILES)
diff --git a/exynos/Makefile.am b/exynos/Makefile.am
index f99f8981..2305a333 100644
--- a/exynos/Makefile.am
+++ b/exynos/Makefile.am
@@ -1,13 +1,12 @@
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la
libdrm_exynos_ladir = $(libdir)
libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+libdrm_exynos_la_LIBADD = ../libdrm.la
libdrm_exynos_la_SOURCES = \
exynos_drm.c \
diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
index 0771d146..7f070336 100644
--- a/freedreno/Makefile.am
+++ b/freedreno/Makefile.am
@@ -4,7 +4,6 @@ include Makefile.sources
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
@@ -12,7 +11,6 @@ libdrm_freedreno_ladir = $(libdir)
libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libdrm_freedreno_la_LIBADD = \
../libdrm.la \
- @PTHREADSTUBS_LIBS@ \
@CLOCK_LIB@
libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES)
diff --git a/intel/Makefile.am b/intel/Makefile.am
index c52e8c08..8f22e321 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -27,7 +27,6 @@ include Makefile.sources
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
- $(PTHREADSTUBS_CFLAGS) \
$(PCIACCESS_CFLAGS) \
$(VALGRIND_CFLAGS) \
-I$(top_srcdir)/include/drm
@@ -36,7 +35,6 @@ libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
libdrm_intel_ladir = $(libdir)
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libdrm_intel_la_LIBADD = ../libdrm.la \
- @PTHREADSTUBS_LIBS@ \
@PCIACCESS_LIBS@ \
@CLOCK_LIB@
diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am
index 344a8445..5ad2ecb4 100644
--- a/nouveau/Makefile.am
+++ b/nouveau/Makefile.am
@@ -3,14 +3,13 @@ include Makefile.sources
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm \
-DDEBUG
libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
libdrm_nouveau_ladir = $(libdir)
libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+libdrm_nouveau_la_LIBADD = ../libdrm.la
libdrm_nouveau_la_SOURCES = $(LIBDRM_NOUVEAU_FILES)
diff --git a/omap/Makefile.am b/omap/Makefile.am
index 599bb9de..4f157de5 100644
--- a/omap/Makefile.am
+++ b/omap/Makefile.am
@@ -1,13 +1,12 @@
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_omap_la_LTLIBRARIES = libdrm_omap.la
libdrm_omap_ladir = $(libdir)
libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+libdrm_omap_la_LIBADD = ../libdrm.la
libdrm_omap_la_SOURCES = omap_drm.c
diff --git a/packaging/libdrm.spec b/packaging/libdrm.spec
index c1977936..8a4de9f0 100644
--- a/packaging/libdrm.spec
+++ b/packaging/libdrm.spec
@@ -10,7 +10,7 @@ Source1001: %name.manifest
BuildRequires: kernel-headers
BuildRequires: pkgconfig(pciaccess)
-BuildRequires: pkgconfig(pthread-stubs)
+BuildRequires: kernel-headers
%description
Direct Rendering Manager headers and kernel modules.
diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index e2415314..562ef088 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -27,13 +27,12 @@ include Makefile.sources
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
libdrm_radeon_ladir = $(libdir)
libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+libdrm_radeon_la_LIBADD = ../libdrm.la
libdrm_radeon_la_SOURCES = $(LIBDRM_RADEON_FILES)
diff --git a/tegra/Makefile.am b/tegra/Makefile.am
index fb40be55..9cbb40ed 100644
--- a/tegra/Makefile.am
+++ b/tegra/Makefile.am
@@ -3,13 +3,12 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include/drm
AM_CFLAGS = \
- @PTHREADSTUBS_CFLAGS@ \
$(WARN_CFLAGS)
libdrm_tegra_ladir = $(libdir)
libdrm_tegra_la_LTLIBRARIES = libdrm_tegra.la
libdrm_tegra_la_LDFLAGS = -version-number 0:0:0 -no-undefined
-libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+libdrm_tegra_la_LIBADD = ../libdrm.la
libdrm_tegra_la_SOURCES = \
private.h \
diff --git a/vigs/Makefile.am b/vigs/Makefile.am
index 06014707..2e743c91 100644
--- a/vigs/Makefile.am
+++ b/vigs/Makefile.am
@@ -7,13 +7,12 @@ AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/vigs \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_vigs_la_LTLIBRARIES = libdrm_vigs.la
libdrm_vigs_ladir = $(libdir)
libdrm_vigs_la_LDFLAGS = -version-number 10:0:0 -no-undefined
-libdrm_vigs_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+libdrm_vigs_la_LIBADD = ../libdrm.la
libdrm_vigs_la_SOURCES = vigs.c