Commit 104e5d2c authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

indent other than GNU indent should be OK now.

Sun Sep 20 09:52:39 1998  Owen Taylor  <otaylor@gtk.org>

	* HACKING: indent other than GNU indent should be OK
	  now.

	* gtk/genmarshal.pl gtk/Makefile.am: Call indent on file
	  instead of piping through indent. If indent wasn't
	  found in ./configure don't bother indenting at
	  all.
parent fd69dc37
Sun Sep 20 09:52:39 1998 Owen Taylor <otaylor@gtk.org>
* HACKING: indent other than GNU indent should be OK
now.
* gtk/genmarshal.pl gtk/Makefile.am: Call indent on file
instead of piping through indent. If indent wasn't
found in ./configure don't bother indenting at
all.
Fri Sep 18 19:11:10 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.h: Add names to prototype for gdk_image_new_bitmap.
......
Sun Sep 20 09:52:39 1998 Owen Taylor <otaylor@gtk.org>
* HACKING: indent other than GNU indent should be OK
now.
* gtk/genmarshal.pl gtk/Makefile.am: Call indent on file
instead of piping through indent. If indent wasn't
found in ./configure don't bother indenting at
all.
Fri Sep 18 19:11:10 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.h: Add names to prototype for gdk_image_new_bitmap.
......
Sun Sep 20 09:52:39 1998 Owen Taylor <otaylor@gtk.org>
* HACKING: indent other than GNU indent should be OK
now.
* gtk/genmarshal.pl gtk/Makefile.am: Call indent on file
instead of piping through indent. If indent wasn't
found in ./configure don't bother indenting at
all.
Fri Sep 18 19:11:10 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.h: Add names to prototype for gdk_image_new_bitmap.
......
Sun Sep 20 09:52:39 1998 Owen Taylor <otaylor@gtk.org>
* HACKING: indent other than GNU indent should be OK
now.
* gtk/genmarshal.pl gtk/Makefile.am: Call indent on file
instead of piping through indent. If indent wasn't
found in ./configure don't bother indenting at
all.
Fri Sep 18 19:11:10 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.h: Add names to prototype for gdk_image_new_bitmap.
......
Sun Sep 20 09:52:39 1998 Owen Taylor <otaylor@gtk.org>
* HACKING: indent other than GNU indent should be OK
now.
* gtk/genmarshal.pl gtk/Makefile.am: Call indent on file
instead of piping through indent. If indent wasn't
found in ./configure don't bother indenting at
all.
Fri Sep 18 19:11:10 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.h: Add names to prototype for gdk_image_new_bitmap.
......
Sun Sep 20 09:52:39 1998 Owen Taylor <otaylor@gtk.org>
* HACKING: indent other than GNU indent should be OK
now.
* gtk/genmarshal.pl gtk/Makefile.am: Call indent on file
instead of piping through indent. If indent wasn't
found in ./configure don't bother indenting at
all.
Fri Sep 18 19:11:10 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.h: Add names to prototype for gdk_image_new_bitmap.
......
Sun Sep 20 09:52:39 1998 Owen Taylor <otaylor@gtk.org>
* HACKING: indent other than GNU indent should be OK
now.
* gtk/genmarshal.pl gtk/Makefile.am: Call indent on file
instead of piping through indent. If indent wasn't
found in ./configure don't bother indenting at
all.
Fri Sep 18 19:11:10 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.h: Add names to prototype for gdk_image_new_bitmap.
......
......@@ -5,7 +5,7 @@ to have the following packages installed:
- GNU automake 1.3
(Beta releases are at ftp://ftp.cygnus.com/pub/tromey)
- GNU libtool 1.2
- GNU indent (1.9.1 is known good)
- indent (GNU indent 1.9.1 is known good)
These should be available by ftp from ftp.gnu.org or any of the
fine GNU mirrors. Beta software can be found at alpha.gnu.org.
......
......@@ -113,6 +113,9 @@ fi
AC_PROG_AWK
AC_CHECK_PROGS(PERL, perl5 perl)
# We would like indent, but don't require it.
AC_CHECK_PROG(INDENT, indent, indent)
REBUILD=\#
if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
if test -n "$AWK" ; then
......@@ -120,7 +123,7 @@ if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
fi
fi
AC_SUBST(REBUILD)
dnl The DU4 header files don't provide library prototypes unless
dnl -std1 is given to the native cc.
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
......
......@@ -262,7 +262,7 @@ gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
&& mv s-gtbe gtktypebuiltins_evals.c
gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl
srcdir=$(srcdir) INDENT=$(INDENT) perl $(srcdir)/genmarshal.pl
# ???
# special remake rules
......
......@@ -21,10 +21,20 @@
);
$srcdir = $ENV{'srcdir'} || '.';
$indent = $ENV{'INDENT'};
sub indent {
my $filename = shift;
if (defined($indent) && $indent ne "") {
system($indent, $filename);
# we try the most likely names for backup files
system("rm", "-f", "$filename.bak", "$filename~");
}
}
open(IL, "<$srcdir/gtkmarshal.list") || die("Open failed: $!");
open(OH, "|indent > $srcdir/gtkmarshal.h") || die("Open failed: $!");
open(OS, "|indent > $srcdir/gtkmarshal.c") || die("Open failed: $!");
open(OH, ">$srcdir/gtkmarshal.h") || die("Open failed: $!");
open(OS, ">$srcdir/gtkmarshal.c") || die("Open failed: $!");
print OH <<EOT;
#ifndef __GTKMARSHAL_H__
......@@ -44,7 +54,8 @@ EOT
print OS qq(#include "gtkmarshal.h"\n\n);
while(chomp($aline = <IL>)) {
while (defined($aline = <IL>)) {
chomp $aline;
($retval, $paramlist) = split(/:/, $aline, 2);
@params = split(/\s*,\s*/, $paramlist);
......@@ -190,3 +201,6 @@ print OH <<EOT;
EOT
close(IL); close(OH); close(OS);
indent("$srcdir/gtkmarshal.h");
indent("$srcdir/gtkmarshal.c");
......@@ -87,7 +87,7 @@ static void gtk_entry_queue_draw (GtkEntry *entry);
static gint gtk_entry_timer (gpointer data);
static gint gtk_entry_position (GtkEntry *entry,
gint x);
void gtk_entry_adjust_scroll (GtkEntry *entry);
/* static void gtk_entry_adjust_scroll (GtkEntry *entry); */
static void gtk_entry_grow_text (GtkEntry *entry);
static void gtk_entry_insert_text (GtkEditable *editable,
const gchar *new_text,
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment