summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-10-14 01:25:57 +0200
committerEric Anholt <eric@anholt.net>2008-10-13 16:39:33 -0700
commitd9c2f65dd8e50736a33e97a55c257ef6843e1ce7 (patch)
tree4828cd22d9a7ce85019a11b815957b3788d57be5
parent3e03d781f7c41a88d5d5f895be9c443bf3592ef0 (diff)
link libdrm_intel properly
libdrm_intel needs symbols from libdrm, so link against it.
-rw-r--r--libdrm/Makefile.am3
-rw-r--r--libdrm/intel/Makefile.am1
2 files changed, 2 insertions, 2 deletions
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index dbe58fb1..63f6e644 100644
--- 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,6 @@ 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 \
libdrm_lists.h
-libdrm_la_LIBADD = @PTHREADSTUBS_LIBS@
libdrmincludedir = ${includedir}
libdrminclude_HEADERS = xf86drm.h
diff --git a/libdrm/intel/Makefile.am b/libdrm/intel/Makefile.am
index 92388c24..5e3dee06 100644
--- 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 \