From ab2f05fa776c0cfcff463b8bfc7a2d2aff830864 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Wed, 31 Mar 2004 16:34:08 +0000 Subject: [PATCH] 2004-03-31 Mike Kestner * configure.in : remove atk/glue/Makefile * atk/Makefile.am : comment out subdirs for now * atk/makefile.win32 : don't build glue * */glue/Makefile.am : remove generated.c from sources * */glue/makefile.win32 : remove generated.c from sources * generator/ObjectGen.cs : disable vm glue generation for now. svn path=/trunk/gtk-sharp/; revision=24850 --- ChangeLog | 9 +++++++++ atk/Makefile.am | 2 +- atk/makefile.win32 | 2 -- configure.in | 1 - gdk/glue/Makefile.am | 1 - gdk/glue/makefile.win32 | 1 - generator/ObjectGen.cs | 2 +- gtk/glue/Makefile.am | 1 - gtk/glue/makefile.win32 | 1 - 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12d8c7897..d10f4e49c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-03-31 Mike Kestner + + * configure.in : remove atk/glue/Makefile + * atk/Makefile.am : comment out subdirs for now + * atk/makefile.win32 : don't build glue + * */glue/Makefile.am : remove generated.c from sources + * */glue/makefile.win32 : remove generated.c from sources + * generator/ObjectGen.cs : disable vm glue generation for now. + 2004-03-30 John Luke [Reworked a bit by MK] diff --git a/atk/Makefile.am b/atk/Makefile.am index 1a32fd3c9..038473eb3 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . glue +#SUBDIRS = . glue API = atk-api.xml RAW_API = atk-api.raw diff --git a/atk/makefile.win32 b/atk/makefile.win32 index 66c224223..1b9ae6ba3 100644 --- a/atk/makefile.win32 +++ b/atk/makefile.win32 @@ -6,7 +6,6 @@ all: windows windows: generated-stamp $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs - cd glue && make -f makefile.win32 generated-stamp: ../generator/codegen.exe atk-api.xml ../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=atk-sharp --gluelib-name=atksharpglue --glue-filename=glue/generated.c && touch generated-stamp @@ -22,5 +21,4 @@ clean: rm -rf generated rm -f glue/generated.c rm -f atk-api.xml - cd glue && make -f makefile.win32 diff --git a/configure.in b/configure.in index 5d339e631..c827a12d0 100644 --- a/configure.in +++ b/configure.in @@ -184,7 +184,6 @@ glib/Makefile glib/glue/Makefile pango/Makefile atk/Makefile -atk/glue/Makefile art/Makefile gdk/Makefile gdk/glue/Makefile diff --git a/gdk/glue/Makefile.am b/gdk/glue/Makefile.am index d55d85c19..a39e95b6d 100644 --- a/gdk/glue/Makefile.am +++ b/gdk/glue/Makefile.am @@ -3,7 +3,6 @@ lib_LTLIBRARIES = libgdksharpglue.la libgdksharpglue_la_SOURCES = \ dragcontext.c \ event.c \ - generated.c \ selection.c \ vmglueheaders.h diff --git a/gdk/glue/makefile.win32 b/gdk/glue/makefile.win32 index d44fc81b2..8e152991c 100755 --- a/gdk/glue/makefile.win32 +++ b/gdk/glue/makefile.win32 @@ -6,7 +6,6 @@ DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-sy GLUE_OBJS = \ dragcontext.o \ event.o \ - generated.o \ selection.o \ win32dll.o diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs index 758500c4d..79c6d2f53 100644 --- a/generator/ObjectGen.cs +++ b/generator/ObjectGen.cs @@ -33,7 +33,7 @@ namespace GtkSharp.Generation { break; case "virtual_method": - vm_nodes.Add (node); + Statistics.IgnoreCount++; break; case "static-string": diff --git a/gtk/glue/Makefile.am b/gtk/glue/Makefile.am index e165d5a8d..5f5c0642a 100644 --- a/gtk/glue/Makefile.am +++ b/gtk/glue/Makefile.am @@ -8,7 +8,6 @@ libgtksharpglue_la_SOURCES = \ combo.c \ dialog.c \ fileselection.c \ - generated.c \ layout.c \ nodestore.c \ object.c \ diff --git a/gtk/glue/makefile.win32 b/gtk/glue/makefile.win32 index 520136859..65ecd08c3 100755 --- a/gtk/glue/makefile.win32 +++ b/gtk/glue/makefile.win32 @@ -11,7 +11,6 @@ GLUE_OBJS = \ combo.o \ dialog.o \ fileselection.o \ - generated.o \ layout.o \ nodestore.o \ object.o \