diff --git a/ChangeLog b/ChangeLog index 4dd387cad..d2262c9b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +2003-10-10 Martin Willemoes Hansen + + * Makefile.in: Updated to reflect moval of api xml files from api/ + to each assembly dir. + * configure.in: Ditto + * art/.cvsignore Ditto + * art/Makefile.in: Ditto + * atk/.cvsignore Ditto + * atk/Makefile.in: Ditto + * gda/.cvsignore Ditto + * gda/Makefile.in: Ditto + * gdk/.cvsignore Ditto + * gdk/Makefile.in: Ditto + * gdk/gdk-symbols.xml Ditto + * glade/.cvsignore Ditto + * glade/Makefile.in: Ditto + * gnome/.cvsignore Ditto + * gnome/Makefile.in: Ditto + * gnomedb/.cvsignore Ditto + * gnomedb/Makefile.in: Ditto + * gst/.cvsignore Ditto + * gst/Makefile.in: Ditto + * gtk/.cvsignore Ditto + * gtk/Makefile.in: Ditto + * gtk/gtk-symbols.xml Ditto + * gtkhtml/.cvsignore Ditto + * gtkhtml/Makefile.in: Ditto + * pango/.cvsignore Ditto + * pango/Makefile.in: Ditto + * rsvg/.cvsignore Ditto + * rsvg/Makefile.in: Ditto + * sources/gtk-sharp-sources.xml: Ditto + * api/: Removed + 2003-10-09 Mike Kestner * api/*-api.xml : regenerated diff --git a/Makefile.in b/Makefile.in index 41e2f883e..4791b900a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ NATIVE_DIRS = glue parser -DIRS=generator api glib pango atk gdk gtk glade art gnome gtkhtml gda gnomedb gconf rsvg sample +DIRS=generator glib pango atk gdk gtk glade art gnome gtkhtml gda gnomedb gconf rsvg sample ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe MCS=mcs diff --git a/api/.cvsignore b/api/.cvsignore deleted file mode 100755 index a00c4c6ae..000000000 --- a/api/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -*.dll -*.exe -generated -generated-stamp -Makefile - diff --git a/api/Makefile.in b/api/Makefile.in deleted file mode 100644 index 9853a686c..000000000 --- a/api/Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ -APIS = \ - atk-api.xml \ - pango-api.xml \ - gdk-api.xml \ - gdk-symbols.xml \ - gtk-api.xml \ - gtk-symbols.xml \ - glade-api.xml \ - art-api.xml \ - gnome-api.xml \ - gda-api.xml \ - gst-api.xml \ - gnomedb-api.xml \ - rsvg-api.xml \ - - -RUNTIME=mono - -all: generated-stamp - -generated-stamp: $(APIS) ../generator/gapi_codegen.exe - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) && touch generated-stamp - -clean: - rm -f generated-stamp - -prefix=@prefix@ -DESTDIR= -apidir=$(DESTDIR)$(prefix)/share/gapi - -install: all - ../mkinstalldirs $(apidir) && \ - cp $(APIS) $(apidir) diff --git a/api/makefile.win32 b/api/makefile.win32 deleted file mode 100755 index 75c006d11..000000000 --- a/api/makefile.win32 +++ /dev/null @@ -1,6 +0,0 @@ -all: generated-stamp - -generated-stamp: atk-api.xml gdk-api.xml gdk-symbols.xml gtk-api.xml gtk-symbols.xml pango-api.xml glade-api.xml ../generator/codegen.exe - ../generator/codegen --generate atk-api.xml gdk-api.xml gdk-symbols.xml gtk-api.xml gtk-symbols.xml pango-api.xml glade-api.xml - touch generated-stamp - diff --git a/art/.cvsignore b/art/.cvsignore index 05b7ea4f7..8e9afea9f 100755 --- a/art/.cvsignore +++ b/art/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/art/Makefile.in b/art/Makefile.in index c5b37c52c..0518855a9 100755 --- a/art/Makefile.in +++ b/art/Makefile.in @@ -1,22 +1,40 @@ +APIS= art-api.xml + +INCLUDE_APIS = ../atk/atk-api.xml \ + ../pango/pango-api.xml \ + ../gdk/gdk-api.xml \ + ../gdk/gdk-symbols.xml + +RUNTIME=mono MCS=mcs -DESTDIR= -prefix=@prefix@ +ASSEMBLY=art-sharp.dll -all: linux +all: $(ASSEMBLY) -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gdk/gdk-imaging-sharp.dll /out:art-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=art-sharp && touch generated-stamp -linux: art-sharp.dll - -art-sharp.dll: generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../gdk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -o art-sharp.dll --recurse '*.cs' +$(ASSEMBLY): generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r System.Drawing -r ../glib/glib-sharp.dll \ + -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ + -r ../gdk/gdk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated -install: all - ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp art-sharp.dll $(DESTDIR)$(prefix)/lib +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib +install: all + ../mkinstalldirs $(libdir) && \ + for i in $(APIS); do \ + cp $$i $(apidir) || true; \ + done && \ + cp $(ASSEMBLY) $(libdir) diff --git a/api/art-api.xml b/art/art-api.xml similarity index 100% rename from api/art-api.xml rename to art/art-api.xml diff --git a/atk/.cvsignore b/atk/.cvsignore index 05b7ea4f7..8e9afea9f 100644 --- a/atk/.cvsignore +++ b/atk/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/atk/Makefile.in b/atk/Makefile.in index 8e5581411..a71a76cd0 100644 --- a/atk/Makefile.in +++ b/atk/Makefile.in @@ -1,22 +1,36 @@ +APIS= atk-api.xml + +INCLUDE_APIS = ../pango/pango-api.xml + +RUNTIME=mono MCS=mcs -DESTDIR= -prefix=@prefix@ +ASSEMBLY=atk-sharp.dll -all: linux +all: $(ASSEMBLY) -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:atk-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=art-sharp && touch generated-stamp -linux: atk-sharp.dll - -atk-sharp.dll: generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -L ../pango -r glib-sharp.dll -r pango-sharp.dll -o atk-sharp.dll --recurse '*.cs' +$(ASSEMBLY): generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ + -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated -install: all - ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp atk-sharp.dll $(DESTDIR)$(prefix)/lib +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib +install: all + ../mkinstalldirs $(libdir) && \ + for i in $(APIS); do \ + cp $$i $(apidir) || true; \ + done && \ + cp $(ASSEMBLY) $(libdir) diff --git a/api/atk-api.xml b/atk/atk-api.xml similarity index 100% rename from api/atk-api.xml rename to atk/atk-api.xml diff --git a/configure.in b/configure.in index 91d629253..060583b0a 100644 --- a/configure.in +++ b/configure.in @@ -111,7 +111,6 @@ AC_OUTPUT([ glue/Makefile parser/Makefile generator/Makefile -api/Makefile glib/Makefile pango/Makefile atk/Makefile diff --git a/gda/.cvsignore b/gda/.cvsignore index 05b7ea4f7..8e9afea9f 100755 --- a/gda/.cvsignore +++ b/gda/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/gda/Makefile.in b/gda/Makefile.in index b00662db1..6b4f6ed5e 100755 --- a/gda/Makefile.in +++ b/gda/Makefile.in @@ -1,22 +1,36 @@ -MCS=mcs -DESTDIR= -prefix=@prefix@ +APIS= gda-api.xml -@ENABLE_GDA_TRUE@ all: linux +RUNTIME=mono +MCS=mcs +ASSEMBLY=gda-sharp.dll + +@ENABLE_GDA_TRUE@ all: $(ASSEMBLY) @ENABLE_GDA_FALSE@ all: -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:gda-sharp.dll /recurse:*.cs +all: $(ASSEMBLY) -linux: gda-sharp.dll +generated-stamp: $(APIS) ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe \ + --generate $(APIS) --outdir=generated --customdir=. \ + --assembly-name=gda-sharp && touch generated-stamp -gda-sharp.dll: Application.cs generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -r glib-sharp.dll -o gda-sharp.dll --recurse '*.cs' +$(ASSEMBLY): generated-stamp *.cs + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r ../glib/glib-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib + install: all -@ENABLE_GDA_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -@ENABLE_GDA_TRUE@ cp gda-sharp.dll $(DESTDIR)$(prefix)/lib +@ENABLE_GDA_TRUE@ ../mkinstalldirs $(libdir) && \ +@ENABLE_GDA_TRUE@ for i in $(APIS); do \ +@ENABLE_GDA_TRUE@ cp $$i $(apidir) || true; \ +@ENABLE_GDA_TRUE@ done && \ +@ENABLE_GDA_TRUE@ cp $(ASSEMBLY) $(libdir) diff --git a/api/gda-api.xml b/gda/gda-api.xml similarity index 100% rename from api/gda-api.xml rename to gda/gda-api.xml diff --git a/gdk/.cvsignore b/gdk/.cvsignore index 05b7ea4f7..8e9afea9f 100644 --- a/gdk/.cvsignore +++ b/gdk/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/gdk/Makefile.in b/gdk/Makefile.in index 5765e1fca..7f73ff4b3 100755 --- a/gdk/Makefile.in +++ b/gdk/Makefile.in @@ -1,22 +1,38 @@ +APIS= gdk-api.xml gdk-symbols.xml + +INCLUDE_APIS = ../atk/atk-api.xml \ + ../pango/pango-api.xml + +RUNTIME=mono MCS=mcs -DESTDIR= -prefix=@prefix@ +ASSEMBLY=gdk-sharp.dll -all: linux +all: $(ASSEMBLY) -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:gdk-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=gdk-sharp && touch generated-stamp -linux: gdk-sharp.dll - -gdk-sharp.dll: *.cs generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -o gdk-sharp.dll --recurse '*.cs' +$(ASSEMBLY): *.cs generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r System.Drawing -r ../glib/glib-sharp.dll \ + -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ + -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated -install: all - ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp gdk-sharp.dll $(DESTDIR)$(prefix)/lib +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib +install: all + ../mkinstalldirs $(libdir) && \ + for i in $(APIS); do \ + cp $$i $(apidir); \ + done && \ + cp $(ASSEMBLY) $(libdir) diff --git a/api/gdk-api.xml b/gdk/gdk-api.xml similarity index 99% rename from api/gdk-api.xml rename to gdk/gdk-api.xml index e451c160b..13bc4adb6 100644 --- a/api/gdk-api.xml +++ b/gdk/gdk-api.xml @@ -1844,8 +1844,8 @@ - - + + diff --git a/api/gdk-symbols.xml b/gdk/gdk-symbols.xml similarity index 100% rename from api/gdk-symbols.xml rename to gdk/gdk-symbols.xml diff --git a/glade/.cvsignore b/glade/.cvsignore index 05b7ea4f7..8e9afea9f 100755 --- a/glade/.cvsignore +++ b/glade/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/glade/Makefile.in b/glade/Makefile.in index 50fa4b551..7b9157020 100755 --- a/glade/Makefile.in +++ b/glade/Makefile.in @@ -1,22 +1,44 @@ -MCS=mcs -DESTDIR= -prefix=@prefix@ +APIS= glade-api.xml -@ENABLE_GLADE_TRUE@ all: linux +INCLUDE_APIS = ../atk/atk-api.xml \ + ../pango/pango-api.xml \ + ../gdk/gdk-api.xml \ + ../gdk/gdk-symbols.xml \ + ../gtk/gtk-api.xml \ + ../gtk/gtk-symbols.xml + +RUNTIME=mono +MCS=mcs +ASSEMBLY=glade-sharp.dll + +@ENABLE_GLADE_TRUE@ all: $(ASSEMBLY) @ENABLE_GLADE_FALSE@ all: -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /out:glade-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=art-sharp && touch generated-stamp -linux: glade-sharp.dll - -glade-sharp.dll: *.cs generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -o glade-sharp.dll --recurse '*.cs' +$(ASSEMBLY): *.cs generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r System.Drawing -r ../glib/glib-sharp.dll \ + -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ + -r ../gdk/gdk-sharp.dll -r ../gtk/gtk-sharp.dll \ + -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib + install: all -@ENABLE_GLADE_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -@ENABLE_GLADE_TRUE@ cp glade-sharp.dll $(DESTDIR)$(prefix)/lib +@ENABLE_GLADE_TRUE@ ../mkinstalldirs $(libdir) && \ +@ENABLE_GLADE_TRUE@ for i in $(APIS); do \ +@ENABLE_GLADE_TRUE@ cp $$i $(apidir) || true; \ +@ENABLE_GLADE_TRUE@ done && \ +@ENABLE_GLADE_TRUE@ cp $(ASSEMBLY) $(libdir) diff --git a/api/glade-api.xml b/glade/glade-api.xml similarity index 100% rename from api/glade-api.xml rename to glade/glade-api.xml diff --git a/gnome/.cvsignore b/gnome/.cvsignore index 05b7ea4f7..8e9afea9f 100644 --- a/gnome/.cvsignore +++ b/gnome/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/gnome/Makefile.in b/gnome/Makefile.in index df9cf31b0..a98296c76 100755 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -1,23 +1,45 @@ -MCS=mcs -DESTDIR= -prefix=@prefix@ +APIS= gnome-api.xml -@ENABLE_GNOME_TRUE@ all: linux +INCLUDE_APIS = ../atk/atk-api.xml \ + ../pango/pango-api.xml \ + ../art/art-api.xml \ + ../gdk/gdk-api.xml \ + ../gdk/gdk-symbols.xml \ + ../gtk/gtk-api.xml \ + ../gtk/gtk-symbols.xml + +RUNTIME=mono +MCS=mcs +ASSEMBLY=gnome-sharp.dll + +@ENABLE_GNOME_TRUE@ all: $(ASSEMBLY) @ENABLE_GNOME_FALSE@ all: -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /out:gnome-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=gnome-sharp && touch generated-stamp -linux: gnome-sharp.dll - -gnome-sharp.dll: generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../art -L ../gdk -L ../gtk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r art-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -o gnome-sharp.dll --recurse '*.cs' +$(ASSEMBLY): *.cs generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r System.Drawing -r ../glib/glib-sharp.dll \ + -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ + -r ../art/art-sharp.dll -r ../gdk/gdk-sharp.dll \ + -r ../gtk/gtk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated -install: all -@ENABLE_GNOME_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -@ENABLE_GNOME_TRUE@ cp gnome-sharp.dll $(DESTDIR)$(prefix)/lib +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib +install: all +@ENABLE_GNOME_TRUE@ ../mkinstalldirs $(libdir) && \ +@ENABLE_GNOME_TRUE@ for i in $(APIS); do \ +@ENABLE_GNOME_TRUE@ cp $$i $(apidir) || true; \ +@ENABLE_GNOME_TRUE@ done && \ +@ENABLE_GNOME_TRUE@ cp $(ASSEMBLY) $(libdir) diff --git a/api/gnome-api.xml b/gnome/gnome-api.xml similarity index 100% rename from api/gnome-api.xml rename to gnome/gnome-api.xml diff --git a/gnomedb/.cvsignore b/gnomedb/.cvsignore index 05b7ea4f7..8e9afea9f 100755 --- a/gnomedb/.cvsignore +++ b/gnomedb/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/gnomedb/Makefile.in b/gnomedb/Makefile.in index dbf83880b..d8dc9a659 100755 --- a/gnomedb/Makefile.in +++ b/gnomedb/Makefile.in @@ -1,22 +1,48 @@ -MCS=mcs -DESTDIR= -prefix=@prefix@ +APIS= gnomedb-api.xml -@ENABLE_GNOMEDB_TRUE@ all: linux +INCLUDE_APIS = ../atk/atk-api.xml \ + ../pango/pango-api.xml \ + ../art/art-api.xml \ + ../gdk/gdk-api.xml \ + ../gdk/gdk-symbols.xml \ + ../gtk/gtk-api.xml \ + ../gtk/gtk-symbols.xml \ + ../gnome/gnome-api.xml \ + ../gda/gda-api.xml + +RUNTIME=mono +MCS=mcs +ASSEMBLY=gnomedb-sharp.dll + +@ENABLE_GNOMEDB_TRUE@ all: $(ASSEMBLY) @ENABLE_GNOMEDB_FALSE@ all: -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../art/art-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll /out:gnomedb-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=gnomedb-sharp && touch generated-stamp -linux: gnomedb-sharp.dll - -gnomedb-sharp.dll: Application.cs generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -L ../pango -L ../atk -L ../art -L ../gdk -L ../gtk -L ../gnome -L ../gda -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r art-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -r gnome-sharp.dll -r gda-sharp.dll -o gnomedb-sharp.dll --recurse '*.cs' +$(ASSEMBLY): *.cs generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ + -r ../atk/atk-sharp.dll -r ../art/art-sharp.dll \ + -r ../gdk/gdk-sharp.dll -r ../gtk/gtk-sharp.dll \ + -r ../gnome/gnome-sharp.dll -r ../gda/gda-sharp.dll \ + -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib + install: all -@ENABLE_GNOMEDB_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -@ENABLE_GNOMEDB_TRUE@ cp gnomedb-sharp.dll $(DESTDIR)$(prefix)/lib +@ENABLE_GNOMEDB_TRUE@ ../mkinstalldirs $(libdir) && \ +@ENABLE_GNOMEDB_TRUE@ for i in $(APIS); do \ +@ENABLE_GNOMEDB_TRUE@ cp $$i $(apidir) || true; \ +@ENABLE_GNOMEDB_TRUE@ done && \ +@ENABLE_GNOMEDB_TRUE@ cp $(ASSEMBLY) $(libdir) diff --git a/api/gnomedb-api.xml b/gnomedb/gnomedb-api.xml similarity index 100% rename from api/gnomedb-api.xml rename to gnomedb/gnomedb-api.xml diff --git a/gst/.cvsignore b/gst/.cvsignore index 05b7ea4f7..8e9afea9f 100755 --- a/gst/.cvsignore +++ b/gst/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/gst/Makefile.in b/gst/Makefile.in index 08913b638..588458787 100755 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -1,22 +1,34 @@ +APIS= gst-api.xml + +RUNTIME=mono MCS=mcs -DESTDIR= -prefix=@prefix@ +ASSEMBLY=gst-sharp.dll -all: linux +all: $(ASSEMBLY) -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:gst-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --outdir=generated --customdir=. --assembly-name=gst-sharp \ + && touch generated-stamp -linux: gst-sharp.dll - -gst-sharp.dll: *.cs - $(MCS) --unsafe --target library -L ../glib -r glib-sharp.dll -o gst-sharp.dll --recurse '*.cs' +$(ASSEMBLY): *.cs generated-stamp + $(MCS) --unsafe --target library \ + -r glib-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated -install: all - ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp gst-sharp.dll $(DESTDIR)$(prefix)/lib || exit 1 +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib + +install: all + ../mkinstalldirs $(libdir) && \ + for i in $(APIS); do \ + cp $$i $(apidir) || true; \ + done && \ + cp $(ASSEMBLY) $(libdir) diff --git a/api/gst-api.xml b/gst/gst-api.xml similarity index 100% rename from api/gst-api.xml rename to gst/gst-api.xml diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 05b7ea4f7..8e9afea9f 100755 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/gtk/Makefile.in b/gtk/Makefile.in index 745bc5a24..913d6531b 100755 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -1,22 +1,40 @@ +APIS= gtk-api.xml gtk-symbols.xml + +INCLUDE_APIS = ../atk/atk-api.xml \ + ../pango/pango-api.xml \ + ../gdk/gdk-api.xml \ + ../gdk/gdk-symbols.xml + +RUNTIME=mono MCS=mcs -DESTDIR= -prefix=@prefix@ +ASSEMBLY=gtk-sharp.dll -all: linux +all: $(ASSEMBLY) -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gdk/gdk-imaging-sharp.dll /out:gtk-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=gtk-sharp && touch generated-stamp -linux: gtk-sharp.dll - -gtk-sharp.dll: *.cs generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../gdk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -o gtk-sharp.dll --recurse '*.cs' +$(ASSEMBLY): *.cs generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r System.Drawing -r ../glib/glib-sharp.dll \ + -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ + -r ../gdk/gdk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated -install: all - ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp gtk-sharp.dll $(DESTDIR)$(prefix)/lib +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib +install: all + ../mkinstalldirs $(libdir) && \ + for i in $(APIS); do \ + cp $$i $(apidir) || true; \ + done && \ + cp $(ASSEMBLY) $(libdir) diff --git a/api/gtk-api.xml b/gtk/gtk-api.xml similarity index 100% rename from api/gtk-api.xml rename to gtk/gtk-api.xml diff --git a/api/gtk-symbols.xml b/gtk/gtk-symbols.xml similarity index 100% rename from api/gtk-symbols.xml rename to gtk/gtk-symbols.xml diff --git a/gtkhtml/.cvsignore b/gtkhtml/.cvsignore index 86a5ef1d8..7cc857729 100755 --- a/gtkhtml/.cvsignore +++ b/gtkhtml/.cvsignore @@ -1,4 +1,4 @@ -gtkhtml-sharp.dll +*.dll generated generated-stamp Makefile diff --git a/gtkhtml/Makefile.in b/gtkhtml/Makefile.in index bb459a5ee..b89ed7745 100755 --- a/gtkhtml/Makefile.in +++ b/gtkhtml/Makefile.in @@ -1,25 +1,34 @@ -INCLUDE_APIS = \ - ../api/atk-api.xml \ - ../api/pango-api.xml \ - ../api/gdk-api.xml \ - ../api/gdk-symbols.xml \ - ../api/gtk-symbols.xml \ - ../api/gtk-api.xml \ - ../api/gnome-api.xml +APIS= gtkhtml-api.xml + +INCLUDE_APIS = ../atk/atk-api.xml \ + ../pango/pango-api.xml \ + ../gdk/gdk-api.xml \ + ../gdk/gdk-symbols.xml \ + ../gtk/gtk-symbols.xml \ + ../gtk/gtk-api.xml \ + ../gnome/gnome-api.xml RUNTIME=mono +MCS=mcs +ASSEMBLY=gtkhtml-sharp.dll -all: gtkhtml-sharp.dll +all: $(ASSEMBLY) generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe - $(RUNTIME) ../generator/gapi_codegen.exe --generate gtkhtml-api.xml --include $(INCLUDE_APIS) --outdir=generated --customdir=. --assembly-name=gtkhtml-sharp && touch generated-stamp + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=gtkhtml-sharp && touch generated-stamp -gtkhtml-sharp.dll: generated-stamp - $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk -L ../art -L ../gnome -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -r art-sharp.dll -r gnome-sharp.dll -o gtkhtml-sharp.dll --recurse '*.cs' +$(ASSEMBLY): generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ + -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll \ + -r ../gtk/gtk-sharp.dll -r ../art/art-sharp.dll \ + -r ../gnome/gnome-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' clean: rm -f generated-stamp - rm -f gtkhtml-sharp.dll + rm -f $(ASSEMBLY) rm -rf generated prefix=@prefix@ @@ -28,6 +37,8 @@ apidir=$(DESTDIR)$(prefix)/share/gapi libdir=$(DESTDIR)$(prefix)/lib install: all - ../mkinstalldirs $(apidir) && \ - cp gtkhtml-api.xml $(apidir) && \ - cp gtkhtml-sharp.dll $(libdir) + ../mkinstalldirs $(libdir) && \ + for i in $(APIS); do \ + cp $$i $(apidir) || true; \ + done && \ + cp $(ASSEMBLY) $(libdir) diff --git a/pango/.cvsignore b/pango/.cvsignore index 05b7ea4f7..8e9afea9f 100644 --- a/pango/.cvsignore +++ b/pango/.cvsignore @@ -1,6 +1,5 @@ *.dll -*.exe -*.xml generated +generated-stamp Makefile diff --git a/pango/Makefile.in b/pango/Makefile.in index a6d6fe108..3fad22a49 100644 --- a/pango/Makefile.in +++ b/pango/Makefile.in @@ -1,22 +1,34 @@ +APIS= pango-api.xml + +RUNTIME=mono MCS=mcs -DESTDIR= -prefix=@prefix@ +ASSEMBLY=pango-sharp.dll -all: linux +all: $(ASSEMBLY) -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:pango-sharp.dll /recurse:*.cs +generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --outdir=generated --customdir=. --assembly-name=pango-sharp \ + && touch generated-stamp -linux: pango-sharp.dll - -pango-sharp.dll: generated/*.cs - $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -r glib-sharp.dll -r System.Drawing -o pango-sharp.dll --recurse '*.cs' +$(ASSEMBLY): *.cs generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r System.Drawing -r glib-sharp.dll \ + -o $(ASSEMBLY) --recurse '*.cs' clean: - rm -f *.dll + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated -install: all - ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp pango-sharp.dll $(DESTDIR)$(prefix)/lib +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib +install: all + ../mkinstalldirs $(libdir) && \ + for i in $(APIS); do \ + cp $$i $(apidir) || true; \ + done && \ + cp $(ASSEMBLY) $(libdir) diff --git a/api/pango-api.xml b/pango/pango-api.xml similarity index 100% rename from api/pango-api.xml rename to pango/pango-api.xml diff --git a/rsvg/.cvsignore b/rsvg/.cvsignore index 14f5b5a7d..8e9afea9f 100755 --- a/rsvg/.cvsignore +++ b/rsvg/.cvsignore @@ -1,4 +1,5 @@ *.dll generated +generated-stamp Makefile diff --git a/rsvg/Makefile.in b/rsvg/Makefile.in index 5ad200008..15688a4a0 100644 --- a/rsvg/Makefile.in +++ b/rsvg/Makefile.in @@ -1,39 +1,45 @@ -COMPILER=mcs -OUTPUT=rsvg-sharp.dll -prefix=@prefix@ +APIS= rsvg-api.xml -@ENABLE_RSVG_TRUE@ all: linux +INCLUDE_APIS = ../atk/atk-api.xml \ + ../pango/pango-api.xml \ + ../gdk/gdk-api.xml \ + ../gdk/gdk-symbols.xml \ + ../gtk/gtk-api.xml \ + ../gtk/gtk-symbols.xml \ + ../art/art-api.xml + +RUNTIME=mono +MCS=mcs +ASSEMBLY=rsvg-sharp.dll + +@ENABLE_RSVG_TRUE@ all: $(ASSEMBLY) @ENABLE_RSVG_FALSE@ all: -linux: $(OUTPUT) +generated-stamp: $(APIS) ../generator/gapi_codegen.exe + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ + --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ + --assembly-name=rsvg-sharp && touch generated-stamp -$(OUTPUT): *.cs generated/*.cs - $(COMPILER) \ - --unsafe\ - -nowarn:0660,0661 \ - --target library \ - -r ../glib/glib-sharp.dll \ - -r ../pango/pango-sharp.dll \ - -r ../atk/atk-sharp.dll \ - -r ../gdk/gdk-sharp.dll \ - -r ../gtk/gtk-sharp.dll \ - -r ../art/art-sharp.dll \ - -o $(OUTPUT) \ - --recurse '*.cs' +$(ASSEMBLY): *.cs generated-stamp + $(MCS) --unsafe -nowarn:0660,0661 --target library \ + -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ + -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll \ + -r ../gtk/gtk-sharp.dll -r ../art/art-sharp.dll \ + -o $(ASSEMBLY) --recurse '*.cs' - - -clean: clean-dll clean-generated - -clean-dll: - rm -f *.dll - -clean-generated: +clean: + rm -f generated-stamp + rm -f $(ASSEMBLY) rm -rf generated - +prefix=@prefix@ +DESTDIR= +apidir=$(DESTDIR)$(prefix)/share/gapi +libdir=$(DESTDIR)$(prefix)/lib install: all -@ENABLE_RSVG_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -@ENABLE_RSVG_TRUE@ cp $(OUTPUT) $(DESTDIR)$(prefix)/lib - +@ENABLE_RSVG_TRUE@ ../mkinstalldirs $(libdir) && \ +@ENABLE_RSVG_TRUE@ for i in $(APIS); do \ +@ENABLE_RSVG_TRUE@ cp $$i $(apidir) || true; \ +@ENABLE_RSVG_TRUE@ done && \ +@ENABLE_RSVG_TRUE@ cp $(ASSEMBLY) $(libdir) diff --git a/api/rsvg-api.xml b/rsvg/rsvg-api.xml similarity index 100% rename from api/rsvg-api.xml rename to rsvg/rsvg-api.xml diff --git a/sources/gtk-sharp-sources.xml b/sources/gtk-sharp-sources.xml index 37fb3fba7..422cf03a0 100644 --- a/sources/gtk-sharp-sources.xml +++ b/sources/gtk-sharp-sources.xml @@ -1,19 +1,19 @@ - + atk-1.2.4/atk - + pango-1.2.3/pango - + gtk+-2.2.2/gdk @@ -25,14 +25,14 @@ - + gtk+-2.2.2/gtk - + libgnome-2.2.3/libgnome @@ -67,42 +67,42 @@ - + libglade-2.0.0/glade - + libart_lgpl-2.3.10 - + libgda-1.0.0/libgda - + libgnomedb-1.0.0/libgnomedb - + gstreamer-0.4.2/gst - + librsvg-2.2.5