Apply Project Standard Autogen 0.1.1
authormartyj19 <martyj19@comcast.net>
Tue, 7 Jul 2009 11:52:27 +0000 (11:52 +0000)
committermartyj19 <martyj19@comcast.net>
Tue, 7 Jul 2009 11:52:27 +0000 (11:52 +0000)
Bring along our own icons, since the ones previously referenced may not be available
- From oxygen-icons.org under LGPL
- Update AUTHORS to give proper attribution
Release 0.1.1

AUTHORS
Makefile.am
autogen.sh
data/input-keyboard.png [new file with mode: 0644]
data/input-mouse.png [new file with mode: 0644]
src/lxinput.c

diff --git a/AUTHORS b/AUTHORS
index 5620182..c29ee7d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+Icons from http://www.oxygen-icons.org/ (licensed under LGPL)
index ba56952..7727821 100644 (file)
@@ -11,9 +11,15 @@ ui_DATA = $(ui_in_files:.glade=.ui)
 desktopfiledir=$(datadir)/applications
 desktopfile_DATA=data/lxinput.desktop
 
+iconsdir=$(datadir)/lxinput
+icons_DATA= \
+       data/input-keyboard.png \
+       data/input-mouse.png
+
 EXTRA_DIST = \
        $(ui_DATA) \
        $(desktopfile_DATA) \
+       $(icons_DATA) \
        $(NULL)
 
 CLEANFILES = \
index cd339c2..b1e1e35 100755 (executable)
@@ -1,21 +1,32 @@
 #! /bin/sh
-AM_VERSION=-1.10
 AC_VERSION=
 
+AUTOMAKE=${AUTOMAKE:-automake}
+AM_INSTALLED_VERSION=$($AUTOMAKE --version | sed -e '2,$ d' -e 's/.* \([0-9]*\.[0-9]*\).*/\1/')
+
+if [ "$AM_INSTALLED_VERSION" != "1.10" \
+    -a "$AM_INSTALLED_VERSION" != "1.11" ];then
+       echo
+       echo "You must have automake > 1.10 or 1.11 installed to compile lxinput."
+       echo "Install the appropriate package for your distribution,"
+       echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+       exit 1
+fi
+
 set -x
 
 if [ "x${ACLOCAL_DIR}" != "x" ]; then
   ACLOCAL_ARG=-I ${ACLOCAL_DIR}
 fi
 
-${ACLOCAL:-aclocal$AC_VERSION} ${ACLOCAL_ARG}
-#${AUTOHEADER:-autoheader$AC_VERSION}
-#AUTOMAKE=${AUTOMAKE:-automake$AM_VERSION} libtoolize -c --automake --force
-AUTOMAKE=${AUTOMAKE:-automake$AM_VERSION} intltoolize -c --automake --force
-${AUTOMAKE:-automake$AM_VERSION} --add-missing --copy --include-deps
+${ACLOCAL:-aclocal$AM_VERSION} ${ACLOCAL_ARG}
+${AUTOHEADER:-autoheader$AC_VERSION} --force
+AUTOMAKE=$AUTOMAKE libtoolize -c --automake --force
+AUTOMAKE=$AUTOMAKE intltoolize -c --automake --force
+$AUTOMAKE --add-missing --copy --include-deps
 ${AUTOCONF:-autoconf$AC_VERSION}
 
 # mkinstalldirs was not correctly installed in some cases.
-cp -f /usr/share/${AUTOMAKE:-automake$AM_VERSION}/mkinstalldirs .
+cp -f /usr/share/${AUTOMAKE}-*/mkinstalldirs .
 
 rm -rf autom4te.cache
diff --git a/data/input-keyboard.png b/data/input-keyboard.png
new file mode 100644 (file)
index 0000000..80d8774
Binary files /dev/null and b/data/input-keyboard.png differ
diff --git a/data/input-mouse.png b/data/input-mouse.png
new file mode 100644 (file)
index 0000000..50c4cf6
Binary files /dev/null and b/data/input-mouse.png differ
index ea86f10..a68dd96 100644 (file)
@@ -181,6 +181,8 @@ int main(int argc, char** argv)
 
     gtk_init(&argc, &argv);
 
+    gtk_icon_theme_prepend_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR);
+
     /* build the UI */
     builder = gtk_builder_new();