From 3f0273bece7e2f7727deeb4cf84facbbf432ac11 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Fri, 10 Oct 2003 18:58:19 +0000 Subject: [PATCH] 2003-10-10 Mike Kestner * */makefile.win32 : remove api dir from build and fix clean target svn path=/trunk/gtk-sharp/; revision=18864 --- ChangeLog | 4 ++++ atk/makefile.win32 | 17 +++++++++++++---- gdk/makefile.win32 | 17 +++++++++++++---- generator/makefile.win32 | 4 ++-- glade/makefile.win32 | 17 +++++++++++++---- glib/makefile.win32 | 7 +++---- gnome/makefile.win32 | 4 +--- gtk/makefile.win32 | 17 +++++++++++++---- makefile.win32 | 14 ++------------ pango/makefile.win32 | 17 +++++++++++++---- 10 files changed, 77 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0e7195e9..7e86f081b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-10-10 Mike Kestner + + * */makefile.win32 : remove api dir from build and fix clean target + 2003-10-10 Mike Kestner * gdk/gdk-api.xml : regenerated diff --git a/atk/makefile.win32 b/atk/makefile.win32 index 9e9ec49c4..a557afbac 100644 --- a/atk/makefile.win32 +++ b/atk/makefile.win32 @@ -1,8 +1,17 @@ +ASSEMBLY=atk-sharp.dll +APIS=atk-api.xml +I_APIS= + all: windows -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:atk-sharp.dll /recurse:*.cs +windows: generated-stamp + $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs -docs: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /doc:atk-sharp-docs.xml /out:atk-sharp.dll /recurse:*.cs +generated-stamp: ../generator/codegen.exe atk-api.xml + ../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=atk-sharp && touch generated-stamp + +clean: + rm -f generated-stamp + rm -f $(ASSEMBLY) + rm -rf generated diff --git a/gdk/makefile.win32 b/gdk/makefile.win32 index 36520bff1..250c158f0 100644 --- a/gdk/makefile.win32 +++ b/gdk/makefile.win32 @@ -1,8 +1,17 @@ +ASSEMBLY=gdk-sharp.dll +APIS=gdk-symbols.xml gdk-api.xml +I_APIS=../atk/atk-api.xml ../pango/pango-api.xml + all: windows -windows: - $(CSC) /unsafe /target:library /r:System.Drawing.dll /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:gdk-sharp.dll /recurse:*.cs +windows: generated-stamp + $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:System.Drawing.dll /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs -docs: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /doc:gdk-sharp-docs.xml /out:gdk-sharp.dll /recurse:*.cs +generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom + ../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gdk-sharp && touch generated-stamp + +clean: + rm -f generated-stamp + rm -f $(ASSEMBLY) + rm -rf generated diff --git a/generator/makefile.win32 b/generator/makefile.win32 index 177d2e2bb..0f2e198cf 100644 --- a/generator/makefile.win32 +++ b/generator/makefile.win32 @@ -3,6 +3,6 @@ all: windows windows: *.cs $(CSC) /unsafe /out:codegen.exe *.cs -docs: windows - +clean: + rm -f codegen.exe diff --git a/glade/makefile.win32 b/glade/makefile.win32 index 41d009a9f..eb730c991 100755 --- a/glade/makefile.win32 +++ b/glade/makefile.win32 @@ -1,8 +1,17 @@ +ASSEMBLY=glade-sharp.dll +APIS=glade-api.xml +I_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 + all: windows -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 +windows: generated-stamp + $(CSC) /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 /out:$(ASSEMBLY) /recurse:*.cs -docs: - $(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 /doc:glade-sharp-docs.xml /out:glade-sharp.dll /recurse:*.cs +generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom + ../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=glade-sharp && touch generated-stamp + +clean: + rm -f generated-stamp + rm -f $(ASSEMBLY) + rm -rf generated diff --git a/glib/makefile.win32 b/glib/makefile.win32 index 6e63149fd..249e94676 100644 --- a/glib/makefile.win32 +++ b/glib/makefile.win32 @@ -1,8 +1,7 @@ all: windows windows: - $(CSC) /unsafe /target:library /out:glib-sharp.dll /recurse:*.cs - -docs: - $(CSC) /unsafe /target:library /doc:glib-sharp-docs.xml /out:glib-sharp.dll /recurse:*.cs + $(CSC) /unsafe /nowarn:0660,0661 /target:library /out:glib-sharp.dll /recurse:*.cs +clean: + rm -f glib-sharp.dll diff --git a/gnome/makefile.win32 b/gnome/makefile.win32 index 0cead7c9f..40cae9658 100644 --- a/gnome/makefile.win32 +++ b/gnome/makefile.win32 @@ -1,8 +1,6 @@ all: windows 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 + $(CSC) /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 /out:gnome-sharp.dll /recurse:*.cs -docs: - $(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 /doc:gnome-sharp-docs.xml /out:gnome-sharp.dll /recurse:*.cs diff --git a/gtk/makefile.win32 b/gtk/makefile.win32 index 829d6fcc7..3f893ae53 100644 --- a/gtk/makefile.win32 +++ b/gtk/makefile.win32 @@ -1,8 +1,17 @@ +ASSEMBLY=gtk-sharp.dll +APIS=gtk-api.xml gtk-symbols.xml +I_APIS=../atk/atk-api.xml ../pango/pango-api.xml ../gdk/gdk-api.xml ../gdk/gdk-symbols.xml + all: windows -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 /out:gtk-sharp.dll /recurse:*.cs +windows: generated-stamp + $(CSC) /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 /out:$(ASSEMBLY) /recurse:*.cs -docs: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /doc:gtk-sharp-docs.xml /out:gtk-sharp.dll /recurse:*.cs +generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom + ../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gtk-sharp && touch generated-stamp + +clean: + rm -f generated-stamp + rm -f $(ASSEMBLY) + rm -rf generated diff --git a/makefile.win32 b/makefile.win32 index 1ea477642..65ad21c1c 100755 --- a/makefile.win32 +++ b/makefile.win32 @@ -1,4 +1,4 @@ -DIRS=glue generator api glib pango atk gdk gtk glade +DIRS=glue generator glib pango atk gdk gtk glade ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe /d:WIN32 @@ -10,21 +10,11 @@ windows: done; clean: - rm -f api/generated-stamp - rm -rf lib - -find -iname "*.exe" -exec rm -f \{\} \; - -find -iname "*.dll" -exec rm -f \{\} \; - for i in $(DIRS); do \ - rm -rf $$i/generated; \ + (cd $$i; make -f makefile.win32 clean) || exit 1;\ done; release: clean windows mkdir lib find $(DIRS) -iname "*.dll" -exec cp \{\} lib \; -docs: - for i in $(DIRS); do \ - (cd $$i; CSC="$(CSC)" make -f makefile.win32 docs) || exit 1;\ - done; - diff --git a/pango/makefile.win32 b/pango/makefile.win32 index b61daca39..9a2490feb 100644 --- a/pango/makefile.win32 +++ b/pango/makefile.win32 @@ -1,8 +1,17 @@ +ASSEMBLY=pango-sharp.dll +APIS=pango-api.xml +I_APIS= + all: windows -windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:pango-sharp.dll /recurse:*.cs +windows: generated-stamp + $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:../glib/glib-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs -docs: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /doc:pango-sharp-docs.xml /out:pango-sharp.dll /recurse:*.cs +generated-stamp: ../generator/codegen.exe $(APIS) + ../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=pango-sharp && touch generated-stamp + +clean: + rm -f generated-stamp + rm -f $(ASSEMBLY) + rm -rf generated