Author: gnorton
Date: 2005-12-01 16:43:39 -0500 (Thu, 01 Dec 2005)
New Revision: 53796
Added:
trunk/cocoa-sharp/AUTHORS
trunk/cocoa-sharp/NEWS
trunk/cocoa-sharp/README
trunk/cocoa-sharp/samples/Makefile.am
Removed:
trunk/cocoa-sharp/.gdb_history
trunk/cocoa-sharp/samples/.MonoDoc.cs.swp
trunk/cocoa-sharp/samples/.gdb_history
trunk/cocoa-sharp/src/Cocoa/.Color.cs.swp
trunk/cocoa-sharp/src/Cocoa/cocoa-sharp.dll
trunk/cocoa-sharp/src/WebKit/webkit-sharp.dll
Modified:
trunk/cocoa-sharp/autogen.sh
trunk/cocoa-sharp/configure.in
trunk/cocoa-sharp/doc/Makefile.am
trunk/cocoa-sharp/samples/Makefile
trunk/cocoa-sharp/src/Cocoa/Makefile.am
trunk/cocoa-sharp/src/WebKit/Makefile.am
Log:
2005-12-01 Geoff Norton <[EMAIL PROTECTED]>
* NEWS:
AUTHORS:
README: Add to the build
* configure.in: Dont generate AssemblyInfo.cs
* autogen.sh: Default to using Mac's glibtoolize. Generate
Makefiles properly.
* Drop vim swap files
Deleted: trunk/cocoa-sharp/.gdb_history
===================================================================
--- trunk/cocoa-sharp/.gdb_history 2005-12-01 21:34:44 UTC (rev 53795)
+++ trunk/cocoa-sharp/.gdb_history 2005-12-01 21:43:39 UTC (rev 53796)
@@ -1,6 +0,0 @@
-c
-bt
-p print_method_from_ip (0x017245a0)
-info registers
-p (char *)0x90a18adc
-q
Added: trunk/cocoa-sharp/AUTHORS
===================================================================
Added: trunk/cocoa-sharp/NEWS
===================================================================
Added: trunk/cocoa-sharp/README
===================================================================
Modified: trunk/cocoa-sharp/autogen.sh
===================================================================
--- trunk/cocoa-sharp/autogen.sh 2005-12-01 21:34:44 UTC (rev 53795)
+++ trunk/cocoa-sharp/autogen.sh 2005-12-01 21:43:39 UTC (rev 53796)
@@ -4,7 +4,7 @@
PACKAGE=cocoa-sharp
-LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+LIBTOOLIZE=${LIBTOOLIZE-glibtoolize}
LIBTOOLIZE_FLAGS="--copy --force"
AUTOHEADER=${AUTOHEADER-autoheader}
AUTOMAKE_FLAGS="--add-missing"
Modified: trunk/cocoa-sharp/configure.in
===================================================================
--- trunk/cocoa-sharp/configure.in 2005-12-01 21:34:44 UTC (rev 53795)
+++ trunk/cocoa-sharp/configure.in 2005-12-01 21:43:39 UTC (rev 53796)
@@ -59,6 +59,8 @@
AC_OUTPUT([
Makefile
src/Makefile
-src/Cocoa/AssemblyInfo.cs
-src/WebKit/AssemblyInfo.cs
+src/Cocoa/Makefile
+src/WebKit/Makefile
+doc/Makefile
+samples/Makefile
])
Modified: trunk/cocoa-sharp/doc/Makefile.am
===================================================================
--- trunk/cocoa-sharp/doc/Makefile.am 2005-12-01 21:34:44 UTC (rev 53795)
+++ trunk/cocoa-sharp/doc/Makefile.am 2005-12-01 21:43:39 UTC (rev 53796)
@@ -47,6 +47,6 @@
mkdir -p $(distdir)/en/$$i; \
cp $(srcdir)/en/$$i/*.xml $(distdir)/en/$$i; \
done
-all:
- mono
/Library/Frameworks/Mono.framework/Versions/Current/lib/monodoc/monodocer.exe
-assembly:../src/Cocoa/cocoa-sharp.dll -assembly:../src/WebKit/webkit-sharp.dll
-path:. -name:"Cocoa#"
- mono
/Library/Frameworks/Mono.framework/Versions/Current/lib/monodoc/assembler.exe
--ecma . --out cocoa-sharp
+#all:
+# mono
/Library/Frameworks/Mono.framework/Versions/Current/lib/monodoc/monodocer.exe
-assembly:../src/Cocoa/cocoa-sharp.dll -assembly:../src/WebKit/webkit-sharp.dll
-path:. -name:"Cocoa#"
+# mono
/Library/Frameworks/Mono.framework/Versions/Current/lib/monodoc/assembler.exe
--ecma . --out cocoa-sharp
Deleted: trunk/cocoa-sharp/samples/.MonoDoc.cs.swp
===================================================================
(Binary files differ)
Deleted: trunk/cocoa-sharp/samples/.gdb_history
===================================================================
--- trunk/cocoa-sharp/samples/.gdb_history 2005-12-01 21:34:44 UTC (rev
53795)
+++ trunk/cocoa-sharp/samples/.gdb_history 2005-12-01 21:43:39 UTC (rev
53796)
@@ -1,2 +0,0 @@
-c
-q
Modified: trunk/cocoa-sharp/samples/Makefile
===================================================================
--- trunk/cocoa-sharp/samples/Makefile 2005-12-01 21:34:44 UTC (rev 53795)
+++ trunk/cocoa-sharp/samples/Makefile 2005-12-01 21:43:39 UTC (rev 53796)
@@ -1,54 +1,320 @@
-all: clean GraphicsView.app View.app Cube.app Rectangle.app DragNDrop
HelloWorld MonoDoc
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# samples/Makefile. Generated from Makefile.in by configure.
-MonoDoc: MonoDoc.nib MonoDoc.cs
- mcs -out:browser.exe MonoDoc.cs -r:System.Web.Services.dll
-r:../src/Cocoa/cocoa-sharp.dll -r:../src/WebKit/webkit-sharp.dll
-r:/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/monodoc/monodoc.dll
- macpack -m:2 -n:MonoDoc -i:applemono.icns -r:mono.png
-r:../src/Cocoa/cocoa-sharp.dll -r:../src/WebKit/webkit-sharp.dll
-r:/Library/Frameworks/Mono.framework/Versions/Current/lib/monodoc/sources
-r:./monodoc.xml
-r:/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/monodoc/monodoc.dll
-r:../doc/cocoa-sharp.source -r:../doc/cocoa-sharp.tree
-r:../doc/cocoa-sharp.zip -r:MonoDoc.nib -o:. -a:browser.exe
- mv MonoDoc.app/Contents/Resources/cocoa-sharp.source
MonoDoc.app/Contents/Resources/sources
- mv MonoDoc.app/Contents/Resources/cocoa-sharp.tree
MonoDoc.app/Contents/Resources/sources
- mv MonoDoc.app/Contents/Resources/cocoa-sharp.zip
MonoDoc.app/Contents/Resources/sources
- rm browser.exe
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-DragNDrop: DragNDrop.nib DragNDrop.cs
- mcs DragNDrop.cs -r:../src/Cocoa/cocoa-sharp.dll
- macpack -m:2 -n:DragNDrop -r:../src/Cocoa/cocoa-sharp.dll
-r:DragNDrop.nib -o:. -a:DragNDrop.exe
- rm DragNDrop.exe
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
-HelloWorld: HelloWorld.nib HelloWorld.cs
- mcs HelloWorld.cs -r:../src/Cocoa/cocoa-sharp.dll
- macpack -m:2 -n:HelloWorld -r:../src/Cocoa/cocoa-sharp.dll
-r:HelloWorld.nib -o:. -a:HelloWorld.exe
- rm HelloWorld.exe
-GraphicsView.app: GraphicsView.exe
- macpack -n:GraphicsView -a:./GraphicsView.exe -r:View.nib -m:2 -o:.
-r:../src/Cocoa/cocoa-sharp.dll
+SHELL = /bin/sh
-View.app: View.exe
- macpack -n:View -a:./View.exe -r:View.nib -m:2 -o:.
-r:../src/Cocoa/cocoa-sharp.dll
+srcdir = .
+top_srcdir = ..
-Cube.app: Cube.exe
- macpack -n:Cube -a:./Cube.exe -r:OpenGLView.nib -m:2 -o:.
-r:../src/Cocoa/cocoa-sharp.dll
+prefix = /usr/local
+exec_prefix = ${prefix}
-Rectangle.app: Rectangle.exe
- macpack -n:Rectangle -a:./Rectangle.exe -r:OpenGLView.nib -m:2 -o:.
-r:../src/Cocoa/cocoa-sharp.dll
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/cocoa-sharp
+pkglibdir = $(libdir)/cocoa-sharp
+pkgincludedir = $(includedir)/cocoa-sharp
+top_builddir = ..
-GraphicsView.exe:
- mcs -out:GraphicsView.exe -define:SYSD ViewSample.cs -r:System.Drawing
-r:../src/Cocoa/cocoa-sharp.dll
+ACLOCAL = ${SHELL} /Users/plasma/Development/cocoa-sharp/missing --run
aclocal-1.6
+AUTOCONF = ${SHELL} /Users/plasma/Development/cocoa-sharp/missing --run
autoconf
+AUTOMAKE = ${SHELL} /Users/plasma/Development/cocoa-sharp/missing --run
automake-1.6
+AUTOHEADER = ${SHELL} /Users/plasma/Development/cocoa-sharp/missing --run
autoheader
-View.exe:
- mcs -out:View.exe -r:System.Drawing ViewSample.cs
-r:../src/Cocoa/cocoa-sharp.dll
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias =
+build_triplet = powerpc-apple-darwin8.3.0
+host_alias =
+host_triplet = powerpc-apple-darwin8.3.0
+target_alias =
+target_triplet = powerpc-apple-darwin8.3.0
-Rectangle.exe:
- mcs -out:Rectangle.exe -define:RECTANGLE OpenGLViewSample.cs
-r:System.Drawing -r:../src/Cocoa/cocoa-sharp.dll
+EXEEXT =
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /Users/plasma/Development/cocoa-sharp/missing --run tar
+API_VERSION = 1.9.0.0
+AR = ar
+AS = @AS@
+AWK = awk
+CC = gcc
+CXX = g++
+CXXCPP = g++ -E
+DEPDIR = .deps
+DLLTOOL = @DLLTOOL@
+ECHO = echo
+EGREP = grep -E
+F77 =
+GACUTIL = /Library/Frameworks/Mono.framework/Versions/Current/bin/gacutil
+GACUTIL_FLAGS = /package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+MAINT =
+MCS = /Library/Frameworks/Mono.framework/Versions/Current/bin/mcs
+MDASSEMBLER = no
+MONODOCER = no
+MONO_CFLAGS = -pthreads -D_THREAD_SAFE
-I/Library/Frameworks/Gnome.framework/Frameworks/Glib2.framework/Versions/2.7.4/include/glib-2.0
-I/Library/Frameworks/Gnome.framework/Frameworks/Glib2.framework/Versions/2.7.4/lib/glib-2.0/include
-I/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig/../../include
+MONO_LIBS = -pthreads -pthread
-L/Library/Frameworks/Gnome.framework/Frameworks/Glib2.framework/Versions/2.7.4/lib
-L/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig/../../lib
-lmono -lm -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv
+OBJC =
+OBJCFLAGS =
+OBJDUMP = @OBJDUMP@
+PACKAGE = cocoa-sharp
+PKG_CONFIG = /Library/Frameworks/PkgConfig.framework/Commands/pkg-config
+RANLIB = ranlib
+RC = @RC@
+RUNTIME = /Library/Frameworks/Mono.framework/Versions/Current/bin/mono
+STRIP = strip
+VERSION = 0.9.0
+am__include = include
+am__quote =
+install_sh = /Users/plasma/Development/cocoa-sharp/install-sh
+APP_TARGETS = HelloWorld.app DragNDrop.app Rectangle.app Cube.app ViewDraw.app
ViewSysDraw.app
-Cube.exe:
- mcs -out:Cube.exe -define:CUBE OpenGLViewSample.cs -r:System.Drawing
-r:../src/Cocoa/cocoa-sharp.dll
-
-clean:
- find . -maxdepth 1 -name '*.exe' -exec rm {} \;
- rm -Rf HelloWorld.app
- rm -Rf DragNDrop.app
- rm -Rf MonoDoc.app
- rm -Rf ./GraphicsView.app/
- rm -Rf ./View.app/
- rm -Rf ./Cube.app/
- rm -Rf ./Rectangle.app/
+#MONODOCDIR = $(prefix)/lib/monodoc
+#TARGETS = CocoaDoc.app $(APP_TARGETS)
+TARGETS = $(APP_TARGETS)
+noinst_SCRIPTS = $(TARGETS)
+
+APP_CLEANFILES = HelloWorld.exe CocoaDoc.exe Rectangle.exe DragNDrop.exe
Cube.exe ViewDraw.exe ViewSysDraw.exe
+
+#CLEANFILES = CocoaDoc.exe $(APP_CLEANFILES)
+CLEANFILES = $(APP_CLEANFILES)
+
+EXTRA_DIST = \
+ DragNDrop.cs \
+ DragNDrop.nib \
+ HelloWorld.cs \
+ HelloWorld.nib \
+ CocoaDoc.cs \
+ CocoaDoc.nib \
+ OpenGLViewSample.cs \
+ OpenGLView.nib \
+ ViewSample.cs \
+ View.nib \
+ applemono.icns \
+ monodoc.xml \
+ mono.png
+
+subdir = samples
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SCRIPTS = $(noinst_SCRIPTS)
+
+DIST_SOURCES =
+DIST_COMMON = ChangeLog Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu samples/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local distclean distclean-generic distclean-libtool \
+ distdir dvi dvi-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+DragNDrop.exe: DragNDrop.cs
+ $(MCS) $(top_srcdir)/samples/DragNDrop.cs
-out:$(top_builddir)/samples/DragNDrop.exe
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+DragNDrop.app: DragNDrop.exe DragNDrop.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/DragNDrop.nib -i:$(top_srcdir)/samples/applemono.icns
-n:DragNDrop -o:$(top_builddir)/samples -a:$(top_builddir)/samples/DragNDrop.exe
+
+HelloWorld.exe: HelloWorld.cs
+ $(MCS) $(top_srcdir)/samples/HelloWorld.cs
-out:$(top_builddir)/samples/HelloWorld.exe
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+HelloWorld.app: HelloWorld.exe HelloWorld.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/HelloWorld.nib -i:$(top_srcdir)/samples/applemono.icns
-n:HelloWorld -o:$(top_builddir)/samples
-a:$(top_builddir)/samples/HelloWorld.exe
+
+Rectangle.exe: OpenGLViewSample.cs
+ $(MCS) $(top_srcdir)/samples/OpenGLViewSample.cs -d:RECTANGLE
-out:$(top_builddir)/samples/Rectangle.exe -r:System.Drawing
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+Rectangle.app: Rectangle.exe OpenGLView.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/OpenGLView.nib -i:$(top_srcdir)/samples/applemono.icns
-n:Rectangle -o:$(top_builddir)/samples -a:$(top_builddir)/samples/Rectangle.exe
+
+Cube.exe: OpenGLViewSample.cs
+ $(MCS) $(top_srcdir)/samples/OpenGLViewSample.cs -d:CUBE
-out:$(top_builddir)/samples/Cube.exe -r:System.Drawing
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+Cube.app: Cube.exe OpenGLView.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/OpenGLView.nib -i:$(top_srcdir)/samples/applemono.icns
-n:Cube -o:$(top_builddir)/samples -a:$(top_builddir)/samples/Cube.exe
+
+ViewDraw.exe: ViewSample.cs
+ $(MCS) $(top_srcdir)/samples/ViewSample.cs
-out:$(top_builddir)/samples/ViewDraw.exe -r:System.Drawing
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+ViewDraw.app: ViewDraw.exe View.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/View.nib -i:$(top_srcdir)/samples/applemono.icns
-n:ViewDraw -o:$(top_builddir)/samples -a:$(top_builddir)/samples/ViewDraw.exe
+
+ViewSysDraw.exe: ViewSample.cs
+ $(MCS) $(top_srcdir)/samples/ViewSample.cs -d:SYSD
-out:$(top_builddir)/samples/ViewSysDraw.exe -r:System.Drawing
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+ViewSysDraw.app: ViewSysDraw.exe View.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/View.nib -i:$(top_srcdir)/samples/applemono.icns
-n:ViewSysDraw -o:$(top_builddir)/samples
-a:$(top_builddir)/samples/ViewSysDraw.exe
+
+#CocoaDoc.exe: CocoaDoc.cs
+# $(MCS) $(top_srcdir)/samples/CocoaDoc.cs -d:SYSD
-out:$(top_builddir)/samples/CocoaDoc.exe -pkg:monodoc -r:System.Web.Services
-r:$(top_builddir)/src/WebKit/webkit-sharp.dll
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+#CocoaDoc.app: CocoaDoc.exe CocoaDoc.nib
+# macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_builddir)/src/WebKit/webkit-sharp.dll
-r:$(top_srcdir)/samples/monodoc.xml -r:$(MONODOCDIR)/sources
-r:$(top_srcdir)/samples/CocoaDoc.nib -r:$(top_srcdir)/samples/mono.png
-i:$(top_srcdir)/samples/applemono.icns -n:CocoaDoc -o:$(top_builddir)/samples
-a:$(top_builddir)/samples/CocoaDoc.exe
+# cp $(top_builddir)/doc/cocoa-sharp.source
$(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
+# cp $(top_builddir)/doc/cocoa-sharp.tree
$(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
+# cp $(top_builddir)/doc/cocoa-sharp.zip
$(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
+
+clean-local:
+ rm -Rf HelloWorld.app CocoaDoc.app Rectangle.app DragNDrop.app Cube.app
ViewDraw.app ViewSysDraw.app
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/cocoa-sharp/samples/Makefile.am
===================================================================
--- trunk/cocoa-sharp/samples/Makefile.am 2005-12-01 21:34:44 UTC (rev
53795)
+++ trunk/cocoa-sharp/samples/Makefile.am 2005-12-01 21:43:39 UTC (rev
53796)
@@ -0,0 +1,83 @@
+APP_TARGETS=HelloWorld.app DragNDrop.app Rectangle.app Cube.app ViewDraw.app
ViewSysDraw.app
+
+if ENABLE_MONODOC
+MONODOCDIR=$(prefix)/lib/monodoc
+TARGETS=CocoaDoc.app $(APP_TARGETS)
+else
+TARGETS=$(APP_TARGETS)
+endif
+
+noinst_SCRIPTS=$(TARGETS)
+
+DragNDrop.exe: DragNDrop.cs
+ $(MCS) $(top_srcdir)/samples/DragNDrop.cs
-out:$(top_builddir)/samples/DragNDrop.exe
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+DragNDrop.app: DragNDrop.exe DragNDrop.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/DragNDrop.nib -i:$(top_srcdir)/samples/applemono.icns
-n:DragNDrop -o:$(top_builddir)/samples -a:$(top_builddir)/samples/DragNDrop.exe
+
+HelloWorld.exe: HelloWorld.cs
+ $(MCS) $(top_srcdir)/samples/HelloWorld.cs
-out:$(top_builddir)/samples/HelloWorld.exe
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+HelloWorld.app: HelloWorld.exe HelloWorld.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/HelloWorld.nib -i:$(top_srcdir)/samples/applemono.icns
-n:HelloWorld -o:$(top_builddir)/samples
-a:$(top_builddir)/samples/HelloWorld.exe
+
+Rectangle.exe: OpenGLViewSample.cs
+ $(MCS) $(top_srcdir)/samples/OpenGLViewSample.cs -d:RECTANGLE
-out:$(top_builddir)/samples/Rectangle.exe -r:System.Drawing
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+Rectangle.app: Rectangle.exe OpenGLView.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/OpenGLView.nib -i:$(top_srcdir)/samples/applemono.icns
-n:Rectangle -o:$(top_builddir)/samples -a:$(top_builddir)/samples/Rectangle.exe
+
+Cube.exe: OpenGLViewSample.cs
+ $(MCS) $(top_srcdir)/samples/OpenGLViewSample.cs -d:CUBE
-out:$(top_builddir)/samples/Cube.exe -r:System.Drawing
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+Cube.app: Cube.exe OpenGLView.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/OpenGLView.nib -i:$(top_srcdir)/samples/applemono.icns
-n:Cube -o:$(top_builddir)/samples -a:$(top_builddir)/samples/Cube.exe
+
+ViewDraw.exe: ViewSample.cs
+ $(MCS) $(top_srcdir)/samples/ViewSample.cs
-out:$(top_builddir)/samples/ViewDraw.exe -r:System.Drawing
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+ViewDraw.app: ViewDraw.exe View.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/View.nib -i:$(top_srcdir)/samples/applemono.icns
-n:ViewDraw -o:$(top_builddir)/samples -a:$(top_builddir)/samples/ViewDraw.exe
+
+ViewSysDraw.exe: ViewSample.cs
+ $(MCS) $(top_srcdir)/samples/ViewSample.cs -d:SYSD
-out:$(top_builddir)/samples/ViewSysDraw.exe -r:System.Drawing
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+ViewSysDraw.app: ViewSysDraw.exe View.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_srcdir)/samples/View.nib -i:$(top_srcdir)/samples/applemono.icns
-n:ViewSysDraw -o:$(top_builddir)/samples
-a:$(top_builddir)/samples/ViewSysDraw.exe
+
+if ENABLE_MONODOC
+CocoaDoc.exe: CocoaDoc.cs
+ $(MCS) $(top_srcdir)/samples/CocoaDoc.cs -d:SYSD
-out:$(top_builddir)/samples/CocoaDoc.exe -pkg:monodoc -r:System.Web.Services
-r:$(top_builddir)/src/WebKit/webkit-sharp.dll
-r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
+
+CocoaDoc.app: CocoaDoc.exe CocoaDoc.nib
+ macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
-r:$(top_builddir)/src/WebKit/webkit-sharp.dll
-r:$(top_srcdir)/samples/monodoc.xml -r:$(MONODOCDIR)/sources
-r:$(top_srcdir)/samples/CocoaDoc.nib -r:$(top_srcdir)/samples/mono.png
-i:$(top_srcdir)/samples/applemono.icns -n:CocoaDoc -o:$(top_builddir)/samples
-a:$(top_builddir)/samples/CocoaDoc.exe
+ cp $(top_builddir)/doc/cocoa-sharp.source
$(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
+ cp $(top_builddir)/doc/cocoa-sharp.tree
$(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
+ cp $(top_builddir)/doc/cocoa-sharp.zip
$(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
+endif
+
+APP_CLEANFILES=HelloWorld.exe CocoaDoc.exe Rectangle.exe DragNDrop.exe
Cube.exe ViewDraw.exe ViewSysDraw.exe
+
+if ENABLE_MONODOC
+CLEANFILES=CocoaDoc.exe $(APP_CLEANFILES)
+else
+CLEANFILES=$(APP_CLEANFILES)
+endif
+
+EXTRA_DIST= \
+ DragNDrop.cs \
+ DragNDrop.nib \
+ HelloWorld.cs \
+ HelloWorld.nib \
+ CocoaDoc.cs \
+ CocoaDoc.nib \
+ OpenGLViewSample.cs \
+ OpenGLView.nib \
+ ViewSample.cs \
+ View.nib \
+ applemono.icns \
+ monodoc.xml \
+ mono.png
+
+clean-local:
+ rm -Rf HelloWorld.app CocoaDoc.app Rectangle.app DragNDrop.app Cube.app
ViewDraw.app ViewSysDraw.app
Deleted: trunk/cocoa-sharp/src/Cocoa/.Color.cs.swp
===================================================================
(Binary files differ)
Modified: trunk/cocoa-sharp/src/Cocoa/Makefile.am
===================================================================
--- trunk/cocoa-sharp/src/Cocoa/Makefile.am 2005-12-01 21:34:44 UTC (rev
53795)
+++ trunk/cocoa-sharp/src/Cocoa/Makefile.am 2005-12-01 21:43:39 UTC (rev
53796)
@@ -1,9 +1,9 @@
ASSEMBLY_NAME=cocoa-sharp
ASSEMBLY=$(ASSEMBLY_NAME).dll
TARGET=$(ASSEMBLY)
-noinst_DATA=$(ASSEMBLY) cocoa-sharp.snk
+noinst_DATA=$(ASSEMBLY)
-CLEANFILES=$(ASSEMBLY) AssemblyInfo.cs
+CLEANFILES=$(ASSEMBLY)
sources= \
./ActionHandler.cs \
@@ -68,9 +68,7 @@
./View.cs \
./Window.cs
-EXTRA_DIST=$(sources) \
- AssemblyInfo.cs \
- cocoa-sharp.snk
+EXTRA_DIST=$(sources)
build_sources = $(addprefix $(srcdir)/, $(sources))
Deleted: trunk/cocoa-sharp/src/Cocoa/cocoa-sharp.dll
===================================================================
(Binary files differ)
Modified: trunk/cocoa-sharp/src/WebKit/Makefile.am
===================================================================
--- trunk/cocoa-sharp/src/WebKit/Makefile.am 2005-12-01 21:34:44 UTC (rev
53795)
+++ trunk/cocoa-sharp/src/WebKit/Makefile.am 2005-12-01 21:43:39 UTC (rev
53796)
@@ -1,9 +1,9 @@
ASSEMBLY_NAME=webkit-sharp
ASSEMBLY=$(ASSEMBLY_NAME).dll
TARGET=$(ASSEMBLY)
-noinst_DATA=$(ASSEMBLY) cocoa-sharp.snk
+noinst_DATA=$(ASSEMBLY)
-CLEANFILES=$(ASSEMBLY) AssemblyInfo.cs
+CLEANFILES=$(ASSEMBLY)
sources= \
./AssemblyInfo.cs \
@@ -13,9 +13,9 @@
./WebHistoryItem.cs \
./WebView.cs
-EXTRA_DIST=$(sources) \
- AssemblyInfo.cs \
- cocoa-sharp.snk
+EXTRA_DIST=$(sources)
+build_sources = $(addprefix $(srcdir)/, $(sources))
+
$(ASSEMBLY): $(build_soruces)
- $(MCS) /out:$(ASSEMBLY) /target:library $(build_sources)
+ $(MCS) /out:$(ASSEMBLY) /r:../Cocoa/cocoa-sharp.dll /target:library
$(build_sources)
Deleted: trunk/cocoa-sharp/src/WebKit/webkit-sharp.dll
===================================================================
(Binary files differ)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
