From 4b7744cb673b2a075d987d965e06c6c7f28a5ee8 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 18 Mar 2004 22:03:49 +0000 Subject: [PATCH] 2004-03-18 Mike Kestner * gdk/Makefile.am : generate glue * gdk/glue/Makefile.am : build generated glue * gdk/glue/makefile.win32 : build generated glue * gdk/glue/vmglueheaders.h : includes for vm glue * gtk/Makefile.am : generate glue * gtk/glue/Makefile.am : build generated glue * gtk/glue/makefile.win32 : build generated glue * gtk/glue/vmglueheaders.h : includes for vm glue svn path=/trunk/gtk-sharp/; revision=24297 --- ChangeLog | 11 +++++++++++ gdk/Makefile.am | 9 +++++---- gdk/glue/.cvsignore | 1 + gdk/glue/Makefile.am | 4 +++- gdk/glue/makefile.win32 | 1 + gdk/glue/vmglueheaders.h | 4 ++++ gtk/Makefile.am | 9 +++++---- gtk/glue/.cvsignore | 1 + gtk/glue/Makefile.am | 2 ++ gtk/glue/makefile.win32 | 1 + gtk/glue/vmglueheaders.h | 4 ++++ 11 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 gdk/glue/vmglueheaders.h create mode 100644 gtk/glue/vmglueheaders.h diff --git a/ChangeLog b/ChangeLog index d697b880c..505523735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-03-18 Mike Kestner + + * gdk/Makefile.am : generate glue + * gdk/glue/Makefile.am : build generated glue + * gdk/glue/makefile.win32 : build generated glue + * gdk/glue/vmglueheaders.h : includes for vm glue + * gtk/Makefile.am : generate glue + * gtk/glue/Makefile.am : build generated glue + * gtk/glue/makefile.win32 : build generated glue + * gtk/glue/vmglueheaders.h : includes for vm glue + 2004-03-18 Mike Kestner * configure.in : expand atk/glue/Makefile diff --git a/gdk/Makefile.am b/gdk/Makefile.am index a03aff494..9d38737b1 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = glue +SUBDIRS = . glue API = gdk-api.xml RAW_API = gdk-api.raw @@ -13,7 +13,7 @@ assemblydir = $(libdir) gapidir = $(datadir)/gapi assembly_DATA = $(ASSEMBLY) gapi_DATA = $(API) $(ADDITIONAL_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c sources = \ EventButton.cs \ @@ -70,8 +70,9 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ + --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + --gluelib-name=gdksharpglue --glue-filename=glue/generated.c \ && touch generated-stamp $(ASSEMBLY): $(build_sources) generated-stamp diff --git a/gdk/glue/.cvsignore b/gdk/glue/.cvsignore index 981de202f..4e348378a 100644 --- a/gdk/glue/.cvsignore +++ b/gdk/glue/.cvsignore @@ -1,3 +1,4 @@ +generated.c Makefile Makefile.in *.la diff --git a/gdk/glue/Makefile.am b/gdk/glue/Makefile.am index 8c88c69d8..d55d85c19 100644 --- a/gdk/glue/Makefile.am +++ b/gdk/glue/Makefile.am @@ -3,7 +3,9 @@ lib_LTLIBRARIES = libgdksharpglue.la libgdksharpglue_la_SOURCES = \ dragcontext.c \ event.c \ - selection.c + generated.c \ + selection.c \ + vmglueheaders.h # Adding a new glue file? # Please remember to update makefile.win32 diff --git a/gdk/glue/makefile.win32 b/gdk/glue/makefile.win32 index 8e152991c..d44fc81b2 100755 --- a/gdk/glue/makefile.win32 +++ b/gdk/glue/makefile.win32 @@ -6,6 +6,7 @@ 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/gdk/glue/vmglueheaders.h b/gdk/glue/vmglueheaders.h new file mode 100644 index 000000000..f935e44b3 --- /dev/null +++ b/gdk/glue/vmglueheaders.h @@ -0,0 +1,4 @@ +/* Headers for virtual method glue compilation */ + +#include + diff --git a/gtk/Makefile.am b/gtk/Makefile.am index bdde994c6..2d1452d39 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = glue +SUBDIRS = . glue API = gtk-api.xml RAW_API = gtk-api.raw @@ -13,7 +13,7 @@ assemblydir = $(libdir) gapidir = $(datadir)/gapi assembly_DATA = $(ASSEMBLY) gapi_DATA = $(API) $(ADDITIONAL_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c sources = \ Application.cs \ @@ -91,8 +91,9 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ + --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + --gluelib-name=gtksharpglue --glue-filename=glue/generated.c \ && touch generated-stamp $(ASSEMBLY): $(build_sources) generated-stamp diff --git a/gtk/glue/.cvsignore b/gtk/glue/.cvsignore index 981de202f..4e348378a 100644 --- a/gtk/glue/.cvsignore +++ b/gtk/glue/.cvsignore @@ -1,3 +1,4 @@ +generated.c Makefile Makefile.in *.la diff --git a/gtk/glue/Makefile.am b/gtk/glue/Makefile.am index 360fce65a..e165d5a8d 100644 --- a/gtk/glue/Makefile.am +++ b/gtk/glue/Makefile.am @@ -8,12 +8,14 @@ libgtksharpglue_la_SOURCES = \ combo.c \ dialog.c \ fileselection.c \ + generated.c \ layout.c \ nodestore.c \ object.c \ paned.c \ selectiondata.c \ style.c \ + vmglueheaders.h \ widget.c # Adding a new glue file? diff --git a/gtk/glue/makefile.win32 b/gtk/glue/makefile.win32 index 65ecd08c3..520136859 100755 --- a/gtk/glue/makefile.win32 +++ b/gtk/glue/makefile.win32 @@ -11,6 +11,7 @@ GLUE_OBJS = \ combo.o \ dialog.o \ fileselection.o \ + generated.o \ layout.o \ nodestore.o \ object.o \ diff --git a/gtk/glue/vmglueheaders.h b/gtk/glue/vmglueheaders.h new file mode 100644 index 000000000..7f2ca5325 --- /dev/null +++ b/gtk/glue/vmglueheaders.h @@ -0,0 +1,4 @@ +/* Headers for virtual method glue compilation */ + +#include +