link libdrm_intel properly

libdrm_intel needs symbols from libdrm, so link against it.
(cherry picked from commit d9c2f65dd8e50736a33e97a55c257ef6843e1ce7)

Conflicts:

	libdrm/Makefile.am

diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index 8fd985b..c3619a6 100644 (file)
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -18,7 +18,7 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-SUBDIRS = intel
+SUBDIRS = . intel
 
 libdrm_la_LTLIBRARIES = libdrm.la
 libdrm_ladir = $(libdir)
@@ -27,7 +27,7 @@ libdrm_la_LDFLAGS = -version-number 2:3:0 -no-undefined
 AM_CFLAGS = -I$(top_srcdir)/shared-core
 libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
        xf86drmMode.c libdrm_lists.h
-libdrm_la_LIBADD = @PTHREADSTUBS_LIBS@
+       libdrm_lists.h
 
 libdrmincludedir = ${includedir}
 libdrminclude_HEADERS = xf86drm.h xf86drmMode.h

diff --git a/libdrm/intel/Makefile.am b/libdrm/intel/Makefile.am
index 92388c2..5e3dee0 100644 (file)
--- a/libdrm/intel/Makefile.am
+++ b/libdrm/intel/Makefile.am
@@ -32,6 +32,7 @@ AM_CFLAGS = \
 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@
 
 libdrm_intel_la_SOURCES = \
        intel_bufmgr.c \