diff --git a/ChangeLog b/ChangeLog index 2eb8f3522..cf6c4e2bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-15 Mike Kestner + + * kill the makefile.win32 build system. it has been unmaintained + for quite some time, replaced by the auto* build in cygwin. + 2008-05-14 Andres G. Aragoneses * atk/Object.custom: Track API changes in GLib.Signal. diff --git a/README b/README index bc81c50e4..32bc110f3 100644 --- a/README +++ b/README @@ -7,12 +7,7 @@ is the 2.6 platform. Building & Installing Gtk#: --------------------------- - To compile Gtk# on Win32 using the .NET framework compiler and libraries, - in the top level directory, type: - - make -f makefile.win32 - - The Linux build is the traditional: + The build is the traditional: ./configure make diff --git a/atk/Makefile.am b/atk/Makefile.am index c615debfb..bf94b8035 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -13,6 +13,6 @@ customs = \ Object.custom \ Util.custom -add_dist = makefile.win32 +add_dist = include ../Makefile.include diff --git a/atk/glue/Makefile.am b/atk/glue/Makefile.am index 5b0098021..176082bdf 100644 --- a/atk/glue/Makefile.am +++ b/atk/glue/Makefile.am @@ -9,7 +9,6 @@ libatksharpglue_2_la_SOURCES = \ vmglueheaders.h # Adding a new glue file? -# Please remember to update makefile.win32 libatksharpglue_2_la_LIBADD = $(ATK_LIBS) @@ -20,4 +19,4 @@ libatksharpglue.dll: $(libatksharpglue_2_la_OBJECTS) libatksharpglue.rc libatksh CLEANFILES = lib*.a lib*.dll -EXTRA_DIST = makefile.win32 win32dll.c +EXTRA_DIST = win32dll.c diff --git a/atk/glue/makefile.win32 b/atk/glue/makefile.win32 deleted file mode 100755 index a157024f1..000000000 --- a/atk/glue/makefile.win32 +++ /dev/null @@ -1,22 +0,0 @@ -GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0` -GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0` -CC=gcc -mno-cygwin -mms-bitfields -DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols - -GLUE_OBJS = \ - generated.o \ - win32dll.o - -all: atksharpglue-2.dll - - -%.o: %.c - $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ - - -atksharpglue-2.dll: $(GLUE_OBJS) - $(DLLWRAP) --output-lib=libatksharpglue-2.a --dllname=atksharpglue-2.dll --driver-name=gcc --output-def=atksharpglue.def $(GLUE_OBJS) $(GTK_LIBS) - - -clean: - rm -f atksharpglue-2.dll *.o libatksharpglue-2.a diff --git a/atk/makefile.win32 b/atk/makefile.win32 deleted file mode 100644 index 007884b1a..000000000 --- a/atk/makefile.win32 +++ /dev/null @@ -1,25 +0,0 @@ -ASSEMBLY=atk-sharp.dll -APIS=atk-api.xml -I_APIS= - -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 - ../gapi-cdecl-insert --keyfile=gtk-sharp.snk atk-sharp.dll - -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 - -atk-api.xml: atk-api.raw Atk.metadata - cp atk-api.raw atk-api.xml - chmod u+w atk-api.xml - ../parser/gapi-fixup.exe --api=atk-api.xml --metadata=Atk.metadata - -clean: - rm -f generated-stamp - rm -f $(ASSEMBLY) - rm -rf generated - rm -f glue/generated.c - rm -f atk-api.xml - diff --git a/gdk/Makefile.am b/gdk/Makefile.am index e73b0fa32..adc21f646 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -63,6 +63,6 @@ customs = \ WindowAttr.custom \ Window.custom -add_dist = makefile.win32 +add_dist = include ../Makefile.include diff --git a/gdk/glue/Makefile.am b/gdk/glue/Makefile.am index 69490f583..39afcff1e 100644 --- a/gdk/glue/Makefile.am +++ b/gdk/glue/Makefile.am @@ -11,7 +11,6 @@ libgdksharpglue_2_la_SOURCES = \ nodist_libgdksharpglue_2_la_SOURCES = generated.c # Adding a new glue file? -# Please remember to update makefile.win32 libgdksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined @@ -24,4 +23,4 @@ libgdksharpglue.dll: $(libgdksharpglue_2_la_OBJECTS) libgdksharpglue.rc libgdksh CLEANFILES = lib*.a lib*.dll -EXTRA_DIST = makefile.win32 win32dll.c +EXTRA_DIST = win32dll.c diff --git a/gdk/glue/makefile.win32 b/gdk/glue/makefile.win32 deleted file mode 100755 index a0ba44714..000000000 --- a/gdk/glue/makefile.win32 +++ /dev/null @@ -1,26 +0,0 @@ -GTK_CFLAGS=`pkg-config --cflags gdk-win32-2.0` -GTK_LIBS=`pkg-config --libs gdk-win32-2.0` -CC=gcc -mno-cygwin -mms-bitfields -DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols - -GLUE_OBJS = \ - dragcontext.o \ - device.o \ - event.o \ - generated.o \ - selection.o \ - win32dll.o - -all: gdksharpglue-2.dll - - -%.o: %.c - $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ - - -gdksharpglue-2.dll: $(GLUE_OBJS) - $(DLLWRAP) --output-lib=libgdksharpglue-2.a --dllname=gdksharpglue-2.dll --driver-name=gcc --output-def=gdksharpglue.def $(GLUE_OBJS) $(GTK_LIBS) - - -clean: - rm -f gdksharpglue-2.dll *.o libgdksharpglue-2.a diff --git a/gdk/makefile.win32 b/gdk/makefile.win32 deleted file mode 100644 index e309be18d..000000000 --- a/gdk/makefile.win32 +++ /dev/null @@ -1,26 +0,0 @@ -ASSEMBLY=gdk-sharp.dll -APIS=gdk-symbols.xml gdk-api.xml -I_APIS=../atk/atk-api.xml ../pango/pango-api.xml - -all: windows - -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 - ../gapi-cdecl-insert --keyfile=gtk-sharp.snk gdk-sharp.dll - cd glue && make -f makefile.win32 - -generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom - ../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gdk-sharp --gluelib-name=gdksharpglue-2 --glue-filename=glue/generated.c --glue-includes=gdk/gdk.h && touch generated-stamp - -gdk-api.xml: gdk-api.raw Gdk.metadata - cp gdk-api.raw gdk-api.xml - chmod u+w gdk-api.xml - ../parser/gapi-fixup.exe --api=gdk-api.xml --metadata=Gdk.metadata - -clean: - rm -f generated-stamp - rm -f $(ASSEMBLY) - rm -rf generated - rm -f gdk-api.xml - cd glue && make -f makefile.win32 clean - diff --git a/generator/Makefile.am b/generator/Makefile.am index b4f4998f9..68328671c 100644 --- a/generator/Makefile.am +++ b/generator/Makefile.am @@ -60,7 +60,6 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) dist_sources = $(sources) EXTRA_DIST = \ - makefile.win32 \ $(dist_sources) gapi_codegen.exe: $(build_sources) diff --git a/generator/makefile.win32 b/generator/makefile.win32 deleted file mode 100644 index 0f2e198cf..000000000 --- a/generator/makefile.win32 +++ /dev/null @@ -1,8 +0,0 @@ -all: windows - -windows: *.cs - $(CSC) /unsafe /out:codegen.exe *.cs - -clean: - rm -f codegen.exe - diff --git a/glade/Makefile.am b/glade/Makefile.am index a1b6b0ed8..feac86104 100644 --- a/glade/Makefile.am +++ b/glade/Makefile.am @@ -23,7 +23,7 @@ customs = \ Interface.custom \ XML.custom -add_dist = makefile.win32 glade-sharp-2.0.pc.in +add_dist = glade-sharp-2.0.pc.in include ../Makefile.include diff --git a/glade/glue/Makefile.am b/glade/glue/Makefile.am index d30e62868..3990f14e7 100644 --- a/glade/glue/Makefile.am +++ b/glade/glue/Makefile.am @@ -22,4 +22,4 @@ libgladesharpglue.dll: $(libgladesharpglue_2_la_OBJECTS) libgladesharpglue.rc li CLEANFILES = lib*.a lib*.dll -EXTRA_DIST = makefile.win32 win32dll.c +EXTRA_DIST = win32dll.c diff --git a/glade/glue/makefile.win32 b/glade/glue/makefile.win32 deleted file mode 100755 index aa63b83a7..000000000 --- a/glade/glue/makefile.win32 +++ /dev/null @@ -1,23 +0,0 @@ -GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0` -GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0` -CC=gcc -mno-cygwin -mms-bitfields -DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols - -GLUE_OBJS = \ - generated.o \ - gladexml.o \ - win32dll.o - -all: gladesharpglue-2.dll - - -%.o: %.c - $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ - - -gladesharpglue-2.dll: $(GLUE_OBJS) - $(DLLWRAP) --output-lib=libgladesharpglue-2.a --dllname=gladesharpglue-2.dll --driver-name=gcc --output-def=gladesharpglue.def $(GLUE_OBJS) $(GTK_LIBS) - - -clean: - rm -f gladesharpglue-2.dll *.o libgladesharpglue-2.a diff --git a/glade/makefile.win32 b/glade/makefile.win32 deleted file mode 100755 index ba62c1db4..000000000 --- a/glade/makefile.win32 +++ /dev/null @@ -1,25 +0,0 @@ -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: 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 - ../gapi-cdecl-insert --keyfile=gtk-sharp.snk glade-sharp.dll - cd glue && make -f makefile.win32 - -generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom - ../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=glade-sharp --gluelib-name=gladesharpglue-2 --glue-filename=glue/generated.c --glue-includes=glade/glade.h,glade/glade-parser.h && touch generated-stamp - -glade-api.xml: glade-api.raw Glade.metadata - cp glade-api.raw glade-api.xml - chmod u+w glade-api.xml - ../parser/gapi-fixup.exe --api=glade-api.xml --metadata=Glade.metadata - -clean: - rm -f generated-stamp - rm -f $(ASSEMBLY) - rm -rf generated - cd glue && make -f makefile.win32 clean - diff --git a/glib/Makefile.am b/glib/Makefile.am index a40a70e85..077299909 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -80,8 +80,7 @@ EXTRA_DIST = \ $(dist_sources) \ $(ASSEMBLY).config.in \ glib-sharp-2.0.pc.in \ - glib-api.xml \ - makefile.win32 + glib-api.xml gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . diff --git a/glib/glue/Makefile.am b/glib/glue/Makefile.am index 203eef951..dd67778cc 100644 --- a/glib/glue/Makefile.am +++ b/glib/glue/Makefile.am @@ -15,7 +15,6 @@ libglibsharpglue_2_la_SOURCES = \ thread.c # Adding a new glue file? -# Please remember to update makefile.win32 libglibsharpglue_2_la_LIBADD = $(GLIB_LIBS) @@ -26,4 +25,4 @@ libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksh CLEANFILES = lib*.a lib*.dll -EXTRA_DIST = makefile.win32 win32dll.c +EXTRA_DIST = win32dll.c diff --git a/glib/glue/makefile.win32 b/glib/glue/makefile.win32 deleted file mode 100755 index 3ac9fe86e..000000000 --- a/glib/glue/makefile.win32 +++ /dev/null @@ -1,30 +0,0 @@ -GTK_CFLAGS=`pkg-config --cflags gobject-2.0` -GTK_LIBS=`pkg-config --libs gobject-2.0` -CC=gcc -mno-cygwin -mms-bitfields -DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols - -GLUE_OBJS = \ - error.o \ - list.o \ - object.o \ - slist.o \ - type.o \ - unichar.o \ - value.o \ - valuearray.o \ - thread.o \ - win32dll.o - -all: glibsharpglue-2.dll - - -%.o: %.c - $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ - - -glibsharpglue-2.dll: $(GLUE_OBJS) - $(DLLWRAP) --output-lib=libglibsharpglue-2.a --dllname=glibsharpglue-2.dll --driver-name=gcc --output-def=glibsharpglue-2.def $(GLUE_OBJS) $(GTK_LIBS) - - -clean: - rm -f glibsharpglue-2.dll *.o libglibsharpglue-2.a diff --git a/glib/makefile.win32 b/glib/makefile.win32 deleted file mode 100644 index a2de18845..000000000 --- a/glib/makefile.win32 +++ /dev/null @@ -1,10 +0,0 @@ -all: windows - -windows: - $(CSC) /unsafe /nowarn:0660,0661 /target:library /out:glib-sharp.dll /recurse:*.cs - ../gapi-cdecl-insert --keyfile=gtk-sharp.snk glib-sharp.dll - cd glue && make -f makefile.win32 - -clean: - rm -f glib-sharp.dll - cd glue && make -f makefile.win32 clean diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 4cbeb304a..5e7b3ac22 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -137,7 +137,7 @@ customs = \ Widget.custom \ Window.custom -add_dist = makefile.win32 gtk-sharp-2.0.pc.in +add_dist = gtk-sharp-2.0.pc.in include ../Makefile.include diff --git a/gtk/glue/Makefile.am b/gtk/glue/Makefile.am index 8a03eb6a1..81a8964a8 100644 --- a/gtk/glue/Makefile.am +++ b/gtk/glue/Makefile.am @@ -18,7 +18,6 @@ libgtksharpglue_2_la_SOURCES = \ nodist_libgtksharpglue_2_la_SOURCES = generated.c # Adding a new glue file? -# Please remember to update makefile.win32 libgtksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined @@ -31,4 +30,4 @@ libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksh CLEANFILES = lib*.a lib*.dll -EXTRA_DIST = makefile.win32 win32dll.c +EXTRA_DIST = win32dll.c diff --git a/gtk/glue/makefile.win32 b/gtk/glue/makefile.win32 deleted file mode 100755 index a93ef2da3..000000000 --- a/gtk/glue/makefile.win32 +++ /dev/null @@ -1,33 +0,0 @@ -GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0` -GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0` -CC=gcc -mno-cygwin -mms-bitfields -DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols - -GLUE_OBJS = \ - adjustment.o \ - cellrenderer.o \ - clipboard.o \ - colorseldialog.o \ - container.o \ - generated.o \ - nodestore.o \ - object.o \ - selectiondata.o \ - style.o \ - targetlist.o \ - widget.o \ - win32dll.o - -all: gtksharpglue-2.dll - - -%.o: %.c - $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ - - -gtksharpglue-2.dll: $(GLUE_OBJS) - $(DLLWRAP) --output-lib=libgtksharpglue-2.a --dllname=gtksharpglue-2.dll --driver-name=gcc --output-def=gtksharpglue-2.def $(GLUE_OBJS) $(GTK_LIBS) - - -clean: - rm -f gtksharpglue-2.dll *.o libgtksharpglue-2.a diff --git a/gtk/makefile.win32 b/gtk/makefile.win32 deleted file mode 100644 index 7c3931d68..000000000 --- a/gtk/makefile.win32 +++ /dev/null @@ -1,26 +0,0 @@ -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: 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 - ../gapi-cdecl-insert --keyfile=gtk-sharp.snk gtk-sharp.dll - cd glue && make -f makefile.win32 - -generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom - ../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gtk-sharp --gluelib-name=gtksharpglue-2 --glue-filename=glue/generated.c --glue-includes=gtk/gtk.h && touch generated-stamp - -gtk-api.xml: gtk-api.raw Gtk.metadata - cp gtk-api.raw gtk-api.xml - chmod u+w gtk-api.xml - ../parser/gapi-fixup.exe --api=gtk-api.xml --metadata=Gtk.metadata - -clean: - rm -f generated-stamp - rm -f $(ASSEMBLY) - rm -rf generated - rm -f gtk-api.xml - cd glue && make -f makefile.win32 clean - diff --git a/gtkdotnet/Makefile.am b/gtkdotnet/Makefile.am index e52874508..2ea69ec6c 100644 --- a/gtkdotnet/Makefile.am +++ b/gtkdotnet/Makefile.am @@ -26,8 +26,7 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs EXTRA_DIST = \ $(sources) \ $(ASSEMBLY).config.in \ - gtk-dotnet-2.0.pc.in \ - makefile.win32 + gtk-dotnet-2.0.pc.in gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . diff --git a/gtkdotnet/makefile.win32 b/gtkdotnet/makefile.win32 deleted file mode 100644 index cdeda5199..000000000 --- a/gtkdotnet/makefile.win32 +++ /dev/null @@ -1,10 +0,0 @@ -ASSEMBLY=gtk-dotnet.dll - -all: windows - -windows: - $(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 /r:System.Drawing.dll /out:$(ASSEMBLY) /recurse:*.cs - ../gapi-cdecl-insert --keyfile=gtk-sharp.snk gtk-dotnet.dll - -clean: - rm -f $(ASSEMBLY) diff --git a/makefile.win32 b/makefile.win32 index f0e825e8e..029066542 100755 --- a/makefile.win32 +++ b/makefile.win32 @@ -1,37 +1,2 @@ -DIRS=generator parser glib pango atk gdk gtk glade gtkdotnet -ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) -#pesky spaces - blame zbowling if this fails -PROGFILES=`cygpath \`cygpath -m -s "$(PROGRAMFILES)"\`` - -## --- C# Compiler --- -## Mono v1.1.3 -#CSC=$(PROGFILES)/Mono-1.1.3/bin/mcs.bat /d:WIN32 -##.NET v1.1.4322 -CSC=$(ROOT)/microsoft.net/framework/v1.1.4322/csc.exe /d:WIN32 - -## --- GACUTIL --- -## .NET gacutil -#GACUTIL=gacutil.exe -## Mono gacutil -GACUTIL=gacutil.bat - - -all: windows - -windows: - for i in $(DIRS); do \ - (cp gtk-sharp.snk $$i; cd $$i; CSC="$(CSC)" make -f makefile.win32) || exit 1;\ - done; - -clean: - for i in $(DIRS); do \ - (cd $$i; make -f makefile.win32 clean) || exit 1;\ - done; - `rm -r lib` - -release: clean windows - `mkdir -p lib` - find $(DIRS) -iname "*.dll" -exec cp \{\} lib \; - -gac: release - find -iname "*-sharp.dll" -exec $(GACUTIL) /i \{\} \; +all: + # makefile.win32 is no longer supported. Use configure && make for the autotools build. diff --git a/pango/Makefile.am b/pango/Makefile.am index a8d75ff4a..e5655c131 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -51,7 +51,7 @@ customs = \ TabArray.custom \ Units.custom -add_dist = makefile.win32 +add_dist = include ../Makefile.include diff --git a/pango/glue/Makefile.am b/pango/glue/Makefile.am index c2219232c..b9acad06c 100644 --- a/pango/glue/Makefile.am +++ b/pango/glue/Makefile.am @@ -7,7 +7,6 @@ libpangosharpglue_2_la_SOURCES = \ nodist_libpangosharpglue_2_la_SOURCES = generated.c # Adding a new glue file? -# Please remember to update makefile.win32 libpangosharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined @@ -20,4 +19,4 @@ libpangosharpglue.dll: $(libpangosharpglue_2_la_OBJECTS) libpangosharpglue.rc li CLEANFILES = lib*.a lib*.dll -EXTRA_DIST = makefile.win32 win32dll.c +EXTRA_DIST = win32dll.c diff --git a/pango/glue/makefile.win32 b/pango/glue/makefile.win32 deleted file mode 100644 index ed29b51e7..000000000 --- a/pango/glue/makefile.win32 +++ /dev/null @@ -1,24 +0,0 @@ -PANGO_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0` -PANGO_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0` -CC=gcc -mno-cygwin -mms-bitfields -DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols - -GLUE_OBJS = \ - attribute.c \ - generated.o \ - units.o \ - win32dll.o - -all: pangosharpglue-2.dll - - -%.o: %.c - $(CC) -c $(CFLAGS) $(PANGO_CFLAGS) -o $@ $^ - - -gtksharpglue-2.dll: $(GLUE_OBJS) - $(DLLWRAP) --output-lib=libpangosharpglue-2.a --dllname=pangosharpglue-2.dll --driver-name=gcc --output-def=pangosharpglue-2.def $(GLUE_OBJS) $(PANGO_LIBS) - - -clean: - rm -f pangosharpglue-2.dll *.o libpangosharpglue-2.a diff --git a/pango/makefile.win32 b/pango/makefile.win32 deleted file mode 100644 index cd53a99b0..000000000 --- a/pango/makefile.win32 +++ /dev/null @@ -1,25 +0,0 @@ -ASSEMBLY=pango-sharp.dll -APIS=pango-api.xml -I_APIS= - -all: windows - -windows: generated-stamp - $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:../glib/glib-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs - ../gapi-cdecl-insert --keyfile=gtk-sharp.snk pango-sharp.dll - -generated-stamp: ../generator/codegen.exe $(APIS) - ../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=pango-sharp --gluelib-name=pangosharpglue-2 --glue-filename=glue/generated.c --glue-includes=pango/pango.h && touch generated-stamp - -pango-api.xml: pango-api.raw pango-symbols.xml Pango.metadata - cp pango-api.raw pango-api.xml - chmod u+w pango-api.xml - ../parser/gapi-fixup.exe --api=pango-api.xml --metadata=Pango.metadata --symbols=pango-symbols.xml - -clean: - rm -f generated-stamp - rm -f $(ASSEMBLY) - rm -rf generated - rm -f pango-api.xml - - diff --git a/parser/Makefile.am b/parser/Makefile.am index c93cfa5f0..ce47bc76d 100644 --- a/parser/Makefile.am +++ b/parser/Makefile.am @@ -12,7 +12,6 @@ sources = \ gapi-parser.cs EXTRA_DIST = \ - makefile.win32 \ $(sources) \ gapi2-parser.in \ gapi_pp.pl \ diff --git a/parser/makefile.win32 b/parser/makefile.win32 deleted file mode 100644 index 49a661203..000000000 --- a/parser/makefile.win32 +++ /dev/null @@ -1,8 +0,0 @@ -all: windows - -windows: *.cs - $(CSC) /unsafe /out:gapi-fixup.exe gapi-fixup.cs - -clean: - rm -f gapi-fixup.exe - diff --git a/sample/makefile.win32 b/sample/makefile.win32 deleted file mode 100644 index 230aff9fe..000000000 --- a/sample/makefile.win32 +++ /dev/null @@ -1,14 +0,0 @@ -references = /r:../glib/glib-sharp.dll /r:../atk/atk-sharp.dll /r:../pango/pango-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../glade/glade-sharp.dll - -all: windows - -windows: - $(CSC) /unsafe /out:gtk-hello-world.exe $(references) HelloWorld.cs - $(CSC) /unsafe /out:button.exe $(references) ButtonApp.cs - $(CSC) /unsafe /out:menu.exe $(references) Menu.cs - $(CSC) /unsafe /out:glade-test.exe $(references) /resource:test.glade GladeTest.cs - $(CSC) /unsafe /out:glade-viewer.exe $(references) GladeViewer.cs - -docs: - @echo "No docs to make." -