Add automake magic required for libobj/

So libobj/ wasn't included in the tarball, and nor was the compatability
functions being added to the driver when they were needed. The oddity is
that using the ./configure script (and thus make distcheck) succeeds. It
was only when 'autoreconf -fi' was run was the first error encoutered.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reported-by: Tobias Klausmann
This commit is contained in:
Chris Wilson 2014-07-23 15:41:29 +01:00
parent dcf9ce4a9f
commit 4ed0937640
5 changed files with 12 additions and 2 deletions

View File

@ -20,7 +20,7 @@
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
SUBDIRS = man xvmc src tools
SUBDIRS = man libobj xvmc src tools
MAINTAINERCLEANFILES = ChangeLog INSTALL

View File

@ -839,6 +839,7 @@ AC_DEFINE_DIR([LIBEXEC_PATH], libexecdir, [libexec directory])
AC_CONFIG_FILES([
Makefile
man/Makefile
libobj/Makefile
src/Makefile
src/legacy/Makefile
src/legacy/i810/Makefile

3
libobj/Makefile.am Normal file
View File

@ -0,0 +1,3 @@
noinst_LTLIBRARIES = libcompat.la
libcompat_la_SOURCES = ignore.c # for portability, always build something
libcompat_la_LIBADD = $(LIBOBJS) $(ALLOCA)

6
libobj/ignore.c Normal file
View File

@ -0,0 +1,6 @@
extern void ignore(void);
void ignore(void)
{
/* libcompat.a cannot be empty therefore I exist */
}

View File

@ -35,7 +35,7 @@ endif
noinst_LTLIBRARIES = libsna.la
libsna_la_LDFLAGS = -pthread
libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la
libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la ../../libobj/libcompat.la
libsna_la_SOURCES = \
atomic.h \