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

diff --git a/Makefile.am b/Makefile.am
index 6bb4854..418fdc9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 
-SUBDIRS = man xvmc src tools
+SUBDIRS = man libobj xvmc src tools
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 

diff --git a/configure.ac b/configure.ac
index 280bfc9..fd997fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/libobj/Makefile.am b/libobj/Makefile.am
new file mode 100644 (file)
index 0000000..92c9ac5
--- /dev/null
+++ b/libobj/Makefile.am
@@ -0,0 +1,3 @@
+noinst_LTLIBRARIES = libcompat.la
+libcompat_la_SOURCES = ignore.c # for portability, always build something
+libcompat_la_LIBADD = $(LIBOBJS) $(ALLOCA)

diff --git a/libobj/ignore.c b/libobj/ignore.c
new file mode 100644 (file)
index 0000000..3c56f2f
--- /dev/null
+++ b/libobj/ignore.c
@@ -0,0 +1,6 @@
+extern void ignore(void);
+
+void ignore(void)
+{
+       /* libcompat.a cannot be empty therefore I exist */
+}

diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index a299ea2..7ec1c36 100644 (file)
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -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 \