2004-03-18 Mike Kestner <mkestner@ximian.com>

* 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
This commit is contained in:
Mike Kestner 2004-03-18 22:03:49 +00:00
parent 9861569931
commit 4b7744cb67
11 changed files with 38 additions and 9 deletions

View File

@ -1,3 +1,14 @@
2004-03-18 Mike Kestner <mkestner@ximian.com>
* 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 <mkestner@ximian.com> 2004-03-18 Mike Kestner <mkestner@ximian.com>
* configure.in : expand atk/glue/Makefile * configure.in : expand atk/glue/Makefile

View File

@ -1,4 +1,4 @@
SUBDIRS = glue SUBDIRS = . glue
API = gdk-api.xml API = gdk-api.xml
RAW_API = gdk-api.raw RAW_API = gdk-api.raw
@ -13,7 +13,7 @@ assemblydir = $(libdir)
gapidir = $(datadir)/gapi gapidir = $(datadir)/gapi
assembly_DATA = $(ASSEMBLY) assembly_DATA = $(ASSEMBLY)
gapi_DATA = $(API) $(ADDITIONAL_API) gapi_DATA = $(API) $(ADDITIONAL_API)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c
sources = \ sources = \
EventButton.cs \ EventButton.cs \
@ -70,8 +70,9 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs)
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
--gluelib-name=gdksharpglue --glue-filename=glue/generated.c \
&& touch generated-stamp && touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp $(ASSEMBLY): $(build_sources) generated-stamp

View File

@ -1,3 +1,4 @@
generated.c
Makefile Makefile
Makefile.in Makefile.in
*.la *.la

View File

@ -3,7 +3,9 @@ lib_LTLIBRARIES = libgdksharpglue.la
libgdksharpglue_la_SOURCES = \ libgdksharpglue_la_SOURCES = \
dragcontext.c \ dragcontext.c \
event.c \ event.c \
selection.c generated.c \
selection.c \
vmglueheaders.h
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32

View File

@ -6,6 +6,7 @@ DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-sy
GLUE_OBJS = \ GLUE_OBJS = \
dragcontext.o \ dragcontext.o \
event.o \ event.o \
generated.o \
selection.o \ selection.o \
win32dll.o win32dll.o

4
gdk/glue/vmglueheaders.h Normal file
View File

@ -0,0 +1,4 @@
/* Headers for virtual method glue compilation */
#include <gdk/gdk.h>

View File

@ -1,4 +1,4 @@
SUBDIRS = glue SUBDIRS = . glue
API = gtk-api.xml API = gtk-api.xml
RAW_API = gtk-api.raw RAW_API = gtk-api.raw
@ -13,7 +13,7 @@ assemblydir = $(libdir)
gapidir = $(datadir)/gapi gapidir = $(datadir)/gapi
assembly_DATA = $(ASSEMBLY) assembly_DATA = $(ASSEMBLY)
gapi_DATA = $(API) $(ADDITIONAL_API) gapi_DATA = $(API) $(ADDITIONAL_API)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c
sources = \ sources = \
Application.cs \ Application.cs \
@ -91,8 +91,9 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs)
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
--gluelib-name=gtksharpglue --glue-filename=glue/generated.c \
&& touch generated-stamp && touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp $(ASSEMBLY): $(build_sources) generated-stamp

View File

@ -1,3 +1,4 @@
generated.c
Makefile Makefile
Makefile.in Makefile.in
*.la *.la

View File

@ -8,12 +8,14 @@ libgtksharpglue_la_SOURCES = \
combo.c \ combo.c \
dialog.c \ dialog.c \
fileselection.c \ fileselection.c \
generated.c \
layout.c \ layout.c \
nodestore.c \ nodestore.c \
object.c \ object.c \
paned.c \ paned.c \
selectiondata.c \ selectiondata.c \
style.c \ style.c \
vmglueheaders.h \
widget.c widget.c
# Adding a new glue file? # Adding a new glue file?

View File

@ -11,6 +11,7 @@ GLUE_OBJS = \
combo.o \ combo.o \
dialog.o \ dialog.o \
fileselection.o \ fileselection.o \
generated.o \
layout.o \ layout.o \
nodestore.o \ nodestore.o \
object.o \ object.o \

4
gtk/glue/vmglueheaders.h Normal file
View File

@ -0,0 +1,4 @@
/* Headers for virtual method glue compilation */
#include <gtk/gtk.h>