forked from AuroraMiddleware/gtk
Remove $(srcdir) from, and clean up, the dependencies. Generate to
1998-06-21 Raja R Harinath <harinath@cs.umn.edu> * gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir) from, and clean up, the dependencies. Generate to intermediate files to prevent problems with Ctrl-C. * gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir. Also commit readable/indented gtkmarshal.[ch].
This commit is contained in:
Raja R Harinath
Raja R Harinath
parent
fdaecac622
commit
e14c6c1d87
@ -1,3 +1,11 @@
|
||||
1998-06-21 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir)
|
||||
from, and clean up, the dependencies. Generate to intermediate
|
||||
files to prevent problems with Ctrl-C.
|
||||
|
||||
* gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir.
|
||||
|
||||
Fri Jun 19 14:46:56 1998 Stefan Jeske <stefan@gtk.org>
|
||||
|
||||
* gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c:
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
1998-06-21 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir)
|
||||
from, and clean up, the dependencies. Generate to intermediate
|
||||
files to prevent problems with Ctrl-C.
|
||||
|
||||
* gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir.
|
||||
|
||||
Fri Jun 19 14:46:56 1998 Stefan Jeske <stefan@gtk.org>
|
||||
|
||||
* gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c:
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
1998-06-21 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir)
|
||||
from, and clean up, the dependencies. Generate to intermediate
|
||||
files to prevent problems with Ctrl-C.
|
||||
|
||||
* gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir.
|
||||
|
||||
Fri Jun 19 14:46:56 1998 Stefan Jeske <stefan@gtk.org>
|
||||
|
||||
* gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c:
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
1998-06-21 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir)
|
||||
from, and clean up, the dependencies. Generate to intermediate
|
||||
files to prevent problems with Ctrl-C.
|
||||
|
||||
* gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir.
|
||||
|
||||
Fri Jun 19 14:46:56 1998 Stefan Jeske <stefan@gtk.org>
|
||||
|
||||
* gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c:
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
1998-06-21 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir)
|
||||
from, and clean up, the dependencies. Generate to intermediate
|
||||
files to prevent problems with Ctrl-C.
|
||||
|
||||
* gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir.
|
||||
|
||||
Fri Jun 19 14:46:56 1998 Stefan Jeske <stefan@gtk.org>
|
||||
|
||||
* gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c:
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
1998-06-21 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir)
|
||||
from, and clean up, the dependencies. Generate to intermediate
|
||||
files to prevent problems with Ctrl-C.
|
||||
|
||||
* gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir.
|
||||
|
||||
Fri Jun 19 14:46:56 1998 Stefan Jeske <stefan@gtk.org>
|
||||
|
||||
* gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c:
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
1998-06-21 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* gtk/Makefile.am (gtk.defs,gtktypebuiltins*): Remove $(srcdir)
|
||||
from, and clean up, the dependencies. Generate to intermediate
|
||||
files to prevent problems with Ctrl-C.
|
||||
|
||||
* gtk/genmarshal.pl: Generate `gtkmarshal.[ch]' in $srcdir.
|
||||
|
||||
Fri Jun 19 14:46:56 1998 Stefan Jeske <stefan@gtk.org>
|
||||
|
||||
* gtk/gtkspinbutton.h gtk/gtkspinbutton.c gtk/testgtk.c:
|
||||
|
||||
@ -206,56 +206,56 @@ gtkinclude_HEADERS = \
|
||||
gtkwindow.h \
|
||||
gtktypebuiltins.h
|
||||
|
||||
.PHONY: auto-files auto-files-1
|
||||
auto-files:
|
||||
rm -f $(srcdir)/gtk.defs
|
||||
make $(srcdir)/gtktypebuiltins_evals.c
|
||||
make $(srcdir)/gtktypebuiltins_ids.c
|
||||
make $(srcdir)/gtktypebuiltins_vars.c
|
||||
make $(srcdir)/gtktypebuiltins.h
|
||||
$(MAKE) auto-files-1
|
||||
|
||||
# generate gtk.defs file from gtk-boxed.defs and gcc -E
|
||||
$(srcdir)/gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs
|
||||
auto-files-1: gtk.defs
|
||||
auto-files-1: gtktypebuiltins_evals.c gtktypebuiltins_ids.c
|
||||
auto-files-1: gtktypebuiltins_vars.c gtktypebuiltins.h
|
||||
|
||||
# generate gtk.defs file from gtk-boxed.defs and *.h
|
||||
gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs
|
||||
srcdir=$(srcdir) \
|
||||
perl $(srcdir)/makeenums.pl defs $(srcdir)/gtk*.h \
|
||||
$(top_srcdir)/gdk/gdk*.h > $@
|
||||
cat $(srcdir)/gtk-boxed.defs >> $@
|
||||
$(top_srcdir)/gdk/gdk*.h > gd.tmp
|
||||
cat $(srcdir)/gtk-boxed.defs >> gd.tmp
|
||||
cp gd.tmp $(srcdir)/gtk.defs
|
||||
rm -f gd.tmp
|
||||
|
||||
# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
|
||||
$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs maketypes.awk
|
||||
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > $@
|
||||
gtktypebuiltins.h: @MAINT@ gtk.defs maketypes.awk
|
||||
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp
|
||||
cp gtb.tmp $(srcdir)/gtktypebuiltins.h
|
||||
rm -f gtb.tmp
|
||||
|
||||
# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
|
||||
$(srcdir)/gtktypebuiltins_vars.c: @MAINT@ $(srcdir)/gtk.defs maketypes.awk
|
||||
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > $@
|
||||
gtktypebuiltins_vars.c: @MAINT@ gtk.defs maketypes.awk
|
||||
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp
|
||||
cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c
|
||||
rm -f gtbv.tmp
|
||||
|
||||
# generate type entries for type-id registration
|
||||
$(srcdir)/gtktypebuiltins_ids.c: @MAINT@ $(srcdir)/gtk.defs maketypes.awk
|
||||
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > $@
|
||||
gtktypebuiltins_ids.c: @MAINT@ gtk.defs maketypes.awk
|
||||
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > gtbi.tmp
|
||||
cp gtbi.tmp $(srcdir)/gtktypebuiltins_ids.c
|
||||
rm -f gtbi.tmp
|
||||
|
||||
# generate enum value arrays
|
||||
$(srcdir)/gtktypebuiltins_evals.c: @MAINT@ makeenums.pl $(srcdir)/gtk.defs
|
||||
gtktypebuiltins_evals.c: @MAINT@ makeenums.pl gtk.defs
|
||||
srcdir=$(srcdir) \
|
||||
perl $(srcdir)/makeenums.pl arrays $(srcdir)/gtk*.h \
|
||||
$(top_srcdir)/gdk/gdk*.h > $@
|
||||
$(top_srcdir)/gdk/gdk*.h > gtbe.tmp
|
||||
cp gtbe.tmp $(srcdir)/gtktypebuiltins_evals.c
|
||||
rm -f gtbe.tmp
|
||||
|
||||
gtkmarshal.c gtkmarshal.h: @MAINT@ gtkmarshal.list
|
||||
gtkmarshal.c gtkmarshal.h: @MAINT@ gtkmarshal.list genmarshal.pl
|
||||
srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl
|
||||
|
||||
# ???
|
||||
# special remake rules
|
||||
#$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/makeenums.awk
|
||||
#$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/makeenums.h
|
||||
#$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/gtk-boxed.defs
|
||||
#$(srcdir)/gtktypebuiltins_vars.c: @MAINT@ $(srcdir)/maketypes.awk
|
||||
#$(srcdir)/gtktypebuiltins_vars.c: @MAINT@ $(srcdir)/gtk.defs
|
||||
#$(srcdir)/gtktypebuiltins_ids.c: @MAINT@ $(srcdir)/maketypes.awk
|
||||
#$(srcdir)/gtktypebuiltins_ids.c: @MAINT@ $(srcdir)/gtk.defs
|
||||
#$(srcdir)/gtktypebuiltins_evals.c: @MAINT@ $(srcdir)/makeenums.awk
|
||||
#$(srcdir)/gtktypebuiltins_evals.c: @MAINT@ $(srcdir)/makeenums.h
|
||||
#$(srcdir)/gtktypebuiltins_evals.c: @MAINT@ $(srcdir)/gtk.defs
|
||||
#$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/maketypes.awk
|
||||
#$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs
|
||||
$(srcdir)/makeenums.h: @MAINT@ $(srcdir)/gtk.h
|
||||
$(srcdir)/makeenums.h: @MAINT@ $(srcdir)/gtkprivate.h
|
||||
makeenums.h: @MAINT@ gtk.h gtkprivate.h
|
||||
|
||||
libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
|
||||
@ -314,7 +314,6 @@ testthreads_LDADD = $(LDADDS)
|
||||
testselection_LDADD = $(LDADDS)
|
||||
simple_LDADD = $(LDADDS)
|
||||
|
||||
|
||||
.PHONY: files test test-debug
|
||||
|
||||
files:
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
"C_CALLBACK"=>"gpointer");
|
||||
|
||||
open(IL, "<".$ENV{'srcdir'}."/gtkmarshal.list") || die("Open failed: $!");
|
||||
open(OH, "|indent > gtkmarshal.h") || die("Open failed: $!");
|
||||
open(OS, "|indent > gtkmarshal.c") || die("Open failed: $!");
|
||||
open(OH, "|indent >".$ENV{'srcdir'}."/gtkmarshal.h") || die("Open failed: $!");
|
||||
open(OS, "|indent >".$ENV{'srcdir'}."/gtkmarshal.c") || die("Open failed: $!");
|
||||
|
||||
print OH <<EOT;
|
||||
#ifndef __GTKMARSHAL_H__
|
||||
|
||||
114
gtk/gtkmarshal.c
114
gtk/gtkmarshal.c
@ -1,53 +1,91 @@
|
||||
#include "gtkmarshal.h"
|
||||
typedef void (*GtkSignal_NONE__POINTER_POINTER)(GtkObject *object, gpointer arg1,
|
||||
gpointer arg2,
|
||||
gpointer user_data);
|
||||
void gtk_marshal_NONE__POINTER_POINTER(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)
|
||||
|
||||
typedef void (*GtkSignal_NONE__POINTER_POINTER) (GtkObject * object,
|
||||
gpointer arg1,
|
||||
gpointer arg2,
|
||||
gpointer user_data);
|
||||
void
|
||||
gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args)
|
||||
{
|
||||
GtkSignal_NONE__POINTER_POINTER rfunc;
|
||||
rfunc = (GtkSignal_NONE__POINTER_POINTER) func;
|
||||
(* rfunc)(object, GTK_VALUE_POINTER(args[0]), GTK_VALUE_POINTER(args[1]), func_data);
|
||||
GtkSignal_NONE__POINTER_POINTER rfunc;
|
||||
rfunc = (GtkSignal_NONE__POINTER_POINTER) func;
|
||||
(*rfunc) (object,
|
||||
GTK_VALUE_POINTER (args[0]),
|
||||
GTK_VALUE_POINTER (args[1]),
|
||||
func_data);
|
||||
}
|
||||
|
||||
typedef gint (*GtkSignal_INT__POINTER_CHAR_CHAR)(GtkObject *object, gpointer arg1,
|
||||
char arg2,
|
||||
char arg3,
|
||||
gpointer user_data);
|
||||
void gtk_marshal_INT__POINTER_CHAR_CHAR(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)
|
||||
typedef gint (*GtkSignal_INT__POINTER_CHAR_CHAR) (GtkObject * object,
|
||||
gpointer arg1,
|
||||
char arg2,
|
||||
char arg3,
|
||||
gpointer user_data);
|
||||
void
|
||||
gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args)
|
||||
{
|
||||
GtkSignal_INT__POINTER_CHAR_CHAR rfunc;
|
||||
gint *return_val;
|
||||
return_val = GTK_RETLOC_INT(args[3]);
|
||||
rfunc = (GtkSignal_INT__POINTER_CHAR_CHAR) func;
|
||||
*return_val = (* rfunc)(object, GTK_VALUE_POINTER(args[0]), GTK_VALUE_CHAR(args[1]), GTK_VALUE_CHAR(args[2]), func_data);
|
||||
GtkSignal_INT__POINTER_CHAR_CHAR rfunc;
|
||||
gint *return_val;
|
||||
return_val = GTK_RETLOC_INT (args[3]);
|
||||
rfunc = (GtkSignal_INT__POINTER_CHAR_CHAR) func;
|
||||
*return_val = (*rfunc) (object,
|
||||
GTK_VALUE_POINTER (args[0]),
|
||||
GTK_VALUE_CHAR (args[1]),
|
||||
GTK_VALUE_CHAR (args[2]),
|
||||
func_data);
|
||||
}
|
||||
|
||||
typedef void (*GtkSignal_NONE__POINTER)(GtkObject *object, gpointer arg1,
|
||||
gpointer user_data);
|
||||
void gtk_marshal_NONE__POINTER(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)
|
||||
typedef void (*GtkSignal_NONE__POINTER) (GtkObject * object,
|
||||
gpointer arg1,
|
||||
gpointer user_data);
|
||||
void
|
||||
gtk_marshal_NONE__POINTER (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args)
|
||||
{
|
||||
GtkSignal_NONE__POINTER rfunc;
|
||||
rfunc = (GtkSignal_NONE__POINTER) func;
|
||||
(* rfunc)(object, GTK_VALUE_POINTER(args[0]), func_data);
|
||||
GtkSignal_NONE__POINTER rfunc;
|
||||
rfunc = (GtkSignal_NONE__POINTER) func;
|
||||
(*rfunc) (object,
|
||||
GTK_VALUE_POINTER (args[0]),
|
||||
func_data);
|
||||
}
|
||||
|
||||
typedef gint (*GtkSignal_INT__POINTER)(GtkObject *object, gpointer arg1,
|
||||
gpointer user_data);
|
||||
void gtk_marshal_INT__POINTER(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)
|
||||
typedef gint (*GtkSignal_INT__POINTER) (GtkObject * object,
|
||||
gpointer arg1,
|
||||
gpointer user_data);
|
||||
void
|
||||
gtk_marshal_INT__POINTER (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args)
|
||||
{
|
||||
GtkSignal_INT__POINTER rfunc;
|
||||
gint *return_val;
|
||||
return_val = GTK_RETLOC_INT(args[1]);
|
||||
rfunc = (GtkSignal_INT__POINTER) func;
|
||||
*return_val = (* rfunc)(object, GTK_VALUE_POINTER(args[0]), func_data);
|
||||
GtkSignal_INT__POINTER rfunc;
|
||||
gint *return_val;
|
||||
return_val = GTK_RETLOC_INT (args[1]);
|
||||
rfunc = (GtkSignal_INT__POINTER) func;
|
||||
*return_val = (*rfunc) (object,
|
||||
GTK_VALUE_POINTER (args[0]),
|
||||
func_data);
|
||||
}
|
||||
|
||||
typedef void (*GtkSignal_NONE__UINT)(GtkObject *object, guint arg1,
|
||||
gpointer user_data);
|
||||
void gtk_marshal_NONE__UINT(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)
|
||||
typedef void (*GtkSignal_NONE__UINT) (GtkObject * object,
|
||||
guint arg1,
|
||||
gpointer user_data);
|
||||
void
|
||||
gtk_marshal_NONE__UINT (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args)
|
||||
{
|
||||
GtkSignal_NONE__UINT rfunc;
|
||||
rfunc = (GtkSignal_NONE__UINT) func;
|
||||
(* rfunc)(object, GTK_VALUE_UINT(args[0]), func_data);
|
||||
GtkSignal_NONE__UINT rfunc;
|
||||
rfunc = (GtkSignal_NONE__UINT) func;
|
||||
(*rfunc) (object,
|
||||
GTK_VALUE_UINT (args[0]),
|
||||
func_data);
|
||||
}
|
||||
|
||||
|
||||
@ -3,14 +3,35 @@
|
||||
|
||||
#include "gtktypeutils.h"
|
||||
#include "gtkobject.h"
|
||||
|
||||
#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINTER
|
||||
void gtk_marshal_NONE__POINTER_POINTER(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args);
|
||||
void gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args);
|
||||
|
||||
#define gtk_marshal_INT__POINTER_CHAR_CHAR gtk_marshal_INT__POINTER_CHAR_CHAR
|
||||
void gtk_marshal_INT__POINTER_CHAR_CHAR(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args);
|
||||
void gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args);
|
||||
|
||||
#define gtk_marshal_NONE__POINTER gtk_marshal_NONE__POINTER
|
||||
void gtk_marshal_NONE__POINTER(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args);
|
||||
void gtk_marshal_NONE__POINTER (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args);
|
||||
|
||||
#define gtk_marshal_INT__POINTER gtk_marshal_INT__POINTER
|
||||
void gtk_marshal_INT__POINTER(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args);
|
||||
void gtk_marshal_NONE__UINT(GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args);
|
||||
void gtk_marshal_INT__POINTER (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args);
|
||||
|
||||
void gtk_marshal_NONE__UINT (GtkObject * object,
|
||||
GtkSignalFunc func,
|
||||
gpointer func_data,
|
||||
GtkArg * args);
|
||||
|
||||
#define gtk_marshal_NONE__BOXED gtk_marshal_NONE__POINTER
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user