Enlightenment CVS committal
Author : kwo
Project : e16
Module : e16keyedit
Dir : e16/e16keyedit
Modified Files:
.cvsignore autogen.sh configure.in e16keyedit.spec ipc.c
menus.c viewer.c
Log Message:
Autofoo and other cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- .cvsignore 18 Mar 2006 10:34:25 -0000 1.3
+++ .cvsignore 18 Mar 2006 19:36:31 -0000 1.4
@@ -5,6 +5,7 @@
autom4te.cache
config.*
configure
+depcomp
install-sh
missing
mkinstalldirs
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 20 Jul 2004 20:21:57 -0000 1.1
+++ autogen.sh 18 Mar 2006 19:36:31 -0000 1.2
@@ -1,6 +1,6 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-# $Id: autogen.sh,v 1.1 2004/07/20 20:21:57 mej Exp $
+# $Id: autogen.sh,v 1.2 2006/03/18 19:36:31 kwo Exp $
broken() {
echo
@@ -14,10 +14,10 @@
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 @@
# 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 "$@"
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- configure.in 26 Jul 2004 07:51:18 -0000 1.2
+++ configure.in 18 Mar 2006 19:36:31 -0000 1.3
@@ -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 @@
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 @@
fi
fi
+AC_SUBST(ENABLE_GTK2)
+
dnl Checks for header files.
AC_PATH_X
AC_HEADER_STDC
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/e16keyedit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e16keyedit.spec 20 Jul 2004 20:21:57 -0000 1.1
+++ e16keyedit.spec 18 Mar 2006 19:36:31 -0000 1.2
@@ -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
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/ipc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ipc.c 18 Mar 2006 15:12:39 -0000 1.6
+++ ipc.c 18 Mar 2006 19:36:31 -0000 1.7
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@@ -218,7 +220,7 @@
-100, -100, 5, 5, 0, 0, 0);
}
-static Window
+static Window
CommsFindCommsWindow(void)
{
unsigned char *s;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/menus.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- menus.c 18 Mar 2006 15:43:18 -0000 1.4
+++ menus.c 18 Mar 2006 19:36:31 -0000 1.5
@@ -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>
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/viewer.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- viewer.c 18 Mar 2006 19:13:15 -0000 1.25
+++ viewer.c 18 Mar 2006 19:36:31 -0000 1.26
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include <gtk/gtk.h>
#include <ctype.h>
#include <stdio.h>
@@ -1098,7 +1100,7 @@
}
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 [EMAIL PROTECTED]");
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
