misc build issues

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..46da1b8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,28 @@
+aclocal.m4
+autom4te.cache
+Makefile.in
+Makefile
+.deps
+.libs
+*.o
+*.lo
+*.la
+libtool
+*.pc
+config.log
+config.status
+config.guess
+config.h
+config.h.in
+config.sub
+config
+configure
+install-sh
+ltmain.sh
+missing
+stamp-h1
+depcomp
+.cproject
+.project
+.settings
+man/omap.4

diff --git a/autogen.sh b/autogen.sh
index d1885dc056573b3181713392e3cf2f2a14d30609..2ca7e5dfacdb44930b11fec6f7b033e98d3830d7 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@ automake=`find_tool automake`
 autoconf=`find_tool autoconf`
 autoheader=`find_tool autoheader`
 
-mkdir -p config && $aclocal && $libtoolize --copy --force && $automake --copy --add-missing --foreign && $autoheader && $autoconf
+mkdir -p config && $aclocal && $autoheader && $libtoolize --copy --force && $automake --copy --add-missing --foreign && $autoconf
 
 test -n "$NOCONFIGURE" && {
   echo "skipping configure stage as requested."

diff --git a/src/Makefile.am b/src/Makefile.am
index 7af823323f99f6644573db52390485e05da67135..66876978596de544743aff776f6cbd6779caf31b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,7 @@ ERROR_CFLAGS = -Werror -Wall -Wdeclaration-after-statement -Wvla \
 AM_CFLAGS = @XORG_CFLAGS@ $(ERROR_CFLAGS)
 omap_drv_la_LTLIBRARIES = omap_drv.la
 omap_drv_la_LDFLAGS = -module -avoid-version -no-undefined
+omap_drv_la_LIBADD = @XORG_LIBS@
 omap_drv_ladir = @moduledir@/drivers
 
 omap_drv_la_SOURCES = \