Autofoo and other cleanups.

SVN revision: 21380
master
Kim Woelders 17 years ago
parent b99d02d665
commit 8ef8cece76
  1. 1
      .cvsignore
  2. 17
      autogen.sh
  3. 8
      configure.in
  4. 2
      e16keyedit.spec
  5. 4
      ipc.c
  6. 6
      menus.c
  7. 4
      viewer.c

@ -5,6 +5,7 @@ aclocal.m4
autom4te.cache
config.*
configure
depcomp
install-sh
missing
mkinstalldirs

@ -14,10 +14,10 @@ DIE=0
echo "Generating build files, please wait...."
AUTOHEADER_CHOICES="$AUTOHEADER autoheader213 autoheader-2.13 autoheader"
ACLOCAL_CHOICES="$ACLOCAL aclocal14 aclocal-1.4 aclocal"
AUTOMAKE_CHOICES="$AUTOMAKE automake14 automake-1.4 automake"
AUTOCONF_CHOICES="$AUTOCONF autoconf213 autoconf-2.13 autoconf"
AUTOHEADER_CHOICES="$AUTOHEADER autoheader"
ACLOCAL_CHOICES="$ACLOCAL aclocal"
AUTOMAKE_CHOICES="$AUTOMAKE automake"
AUTOCONF_CHOICES="$AUTOCONF autoconf"
for i in $AUTOHEADER_CHOICES ; do
$i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break
@ -42,16 +42,13 @@ done
# Export them so configure can AC_SUBST() them.
export AUTOHEADER ACLOCAL AUTOMAKE AUTOCONF
# Check for existing libast.m4 we can use. Use the local one if not.
if test ! -f "`$ACLOCAL --print-ac-dir`/libast.m4"; then
ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
fi
rm -rf aclocal.m4 autom4te.cache
# Run the stuff.
(set -x && $AUTOHEADER)
(set -x && $ACLOCAL $ACLOCAL_FLAGS)
(set -x && $AUTOMAKE -a -c)
(set -x && $AUTOCONF)
(set -x && $AUTOHEADER)
(set -x && $AUTOMAKE -a -c)
# Run configure.
./configure "$@"

@ -1,6 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(ipc.c)
AM_INIT_AUTOMAKE(e16keyedit, 0.1.0)
AM_INIT_AUTOMAKE(e16keyedit, 0.1.99.1)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
AC_PROG_CC
@ -10,7 +12,7 @@ AC_PROG_MAKE_SET
dnl Checks for libraries.
AC_ARG_ENABLE(gtk2,
[ --enable-gtk2=[no/yes] enables the gtk2 GUI (default=yes)],,
[ --enable-gtk2=[no/yes] enables the gtk2 GUI (default=no)],,
enable_gtk2=no)
if [ ! test "x$enable_gtk2" != "xyes"]; then
@ -28,6 +30,8 @@ else
fi
fi
AC_SUBST(ENABLE_GTK2)
dnl Checks for header files.
AC_PATH_X
AC_HEADER_STDC

@ -1,6 +1,6 @@
Summary: GUI Tool for Editing Enlightenment 0.16.x Keybindings
Name: e16keyedit
Version: 0.1.0
Version: 0.1.99.1
Release: 1%{?_vendorsuffix:.%{_vendorsuffix}}
Copyright: BSD-like
Group: User Interface/Desktops

@ -1,3 +1,5 @@
#include "config.h"
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@ -218,7 +220,7 @@ CommsSetup(void)
-100, -100, 5, 5, 0, 0, 0);
}
static Window
static Window
CommsFindCommsWindow(void)
{
unsigned char *s;

@ -1,11 +1,9 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "config.h"
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>

@ -1,3 +1,5 @@
#include "config.h"
#include <gtk/gtk.h>
#include <ctype.h>
#include <stdio.h>
@ -1098,7 +1100,7 @@ main(int argc, char *argv[])
}
CommsSend("set clientname Enlightenment Keybinding Configuration Utility");
CommsSend("set version 0.1.0");
CommsSend("set version " VERSION);
#if 0
CommsSend("set author Mandrake (Geoff Harrison)");
CommsSend("set email mandrake@mandrake.net");

Loading…
Cancel
Save