Author: wade
Date: 2007-11-20 22:26:26 -0500 (Tue, 20 Nov 2007)
New Revision: 90060
Added:
branches/mono-1-2-6/gluezilla/build/Makefile.am
Removed:
branches/mono-1-2-6/gluezilla/build/Makefile
Modified:
branches/mono-1-2-6/gluezilla/ChangeLog
branches/mono-1-2-6/gluezilla/Makefile.am
branches/mono-1-2-6/gluezilla/build/
branches/mono-1-2-6/gluezilla/build/ChangeLog
branches/mono-1-2-6/gluezilla/configure.ac
branches/mono-1-2-6/gluezilla/src/ChangeLog
branches/mono-1-2-6/gluezilla/src/Makefile.am
Log:
Backport 89946, 89947, 89954 from trunk.
Modified: branches/mono-1-2-6/gluezilla/ChangeLog
===================================================================
--- branches/mono-1-2-6/gluezilla/ChangeLog 2007-11-21 02:42:20 UTC (rev
90059)
+++ branches/mono-1-2-6/gluezilla/ChangeLog 2007-11-21 03:26:26 UTC (rev
90060)
@@ -1,3 +1,9 @@
+2007-11-19 Wade Berrier <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * Makefile.am:
+ process build dir
+
2007-11-08 Wade Berrier <[EMAIL PROTECTED]>
* configure.ac: version bump -> 1.2.6
Modified: branches/mono-1-2-6/gluezilla/Makefile.am
===================================================================
--- branches/mono-1-2-6/gluezilla/Makefile.am 2007-11-21 02:42:20 UTC (rev
90059)
+++ branches/mono-1-2-6/gluezilla/Makefile.am 2007-11-21 03:26:26 UTC (rev
90060)
@@ -1 +1 @@
-SUBDIRS = src tests/browser
+SUBDIRS = build src tests/browser
Property changes on: branches/mono-1-2-6/gluezilla/build
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Modified: branches/mono-1-2-6/gluezilla/build/ChangeLog
===================================================================
--- branches/mono-1-2-6/gluezilla/build/ChangeLog 2007-11-21 02:42:20 UTC
(rev 90059)
+++ branches/mono-1-2-6/gluezilla/build/ChangeLog 2007-11-21 03:26:26 UTC
(rev 90060)
@@ -1,3 +1,8 @@
+2007-11-19 Wade Berrier <[EMAIL PROTECTED]>
+
+ * Makefile: rename to Makefile.am, and add EXTRA_DIST
+ to include necessary bits for building on win32
+
2007-11-06 Andreia Gaita <[EMAIL PROTECTED]>
* README.win32: update instructions to include bulding with cygwin on
windows
Deleted: branches/mono-1-2-6/gluezilla/build/Makefile
===================================================================
--- branches/mono-1-2-6/gluezilla/build/Makefile 2007-11-21 02:42:20 UTC
(rev 90059)
+++ branches/mono-1-2-6/gluezilla/build/Makefile 2007-11-21 03:26:26 UTC
(rev 90060)
@@ -1,42 +0,0 @@
-GECKOSDK = ./gecko-sdk
-GECKOIDL = $(GECKOSDK)/idl
-GECKOBIN = $(GECKOSDK)/bin
-GECKOINCLUDE = $(GECKOSDK)/include
-GECKOLIB = $(GECKOSDK)/lib
-
-XPIDL = $(GECKOBIN)/xpidl
-WGET = wget
-
-MAKEHEADER = $(XPIDL) -I ./idl/ -m header
-
-ALL: clean make-headers
-
-make-folders:
- -mkdir ./idl/
- -mkdir ./include/
- -mkdir ./include/widget
- -mkdir ./include/docshell
- -mkdir ./include/dom
- -mkdir ./lib/
- cp $(GECKOIDL)/*.idl ./idl/
- cp $(GECKOINCLUDE)/*.h ./include/
- cp $(GECKOLIB)/* ./lib/
- cp ./idl_extras/* ./idl/
- cp -R ./include_extras/* ./include/
-
-clean:
- -rm -rf idl
- -rm -rf include
- -rm -rf lib
-
-make-headers: make-folders
- $(MAKEHEADER) ./idl/nsIAppShell.idl
- mv nsIAppShell.h ./include/widget/
- $(MAKEHEADER) ./idl/nsIBaseWindow.idl
- mv nsIBaseWindow.h ./include/widget/
- $(MAKEHEADER) ./idl/nsIDocShellTreeItem.idl
- mv nsIDocShellTreeItem.h ./include/docshell/
- $(MAKEHEADER) ./idl/nsIDOMKeyEvent.idl
- mv nsIDOMKeyEvent.h ./include/dom/
- $(MAKEHEADER) ./idl/nsIWebNavigation.idl
- mv nsIWebNavigation.h ./include/docshell/
Copied: branches/mono-1-2-6/gluezilla/build/Makefile.am (from rev 89954,
trunk/gluezilla/build/Makefile.am)
Modified: branches/mono-1-2-6/gluezilla/configure.ac
===================================================================
--- branches/mono-1-2-6/gluezilla/configure.ac 2007-11-21 02:42:20 UTC (rev
90059)
+++ branches/mono-1-2-6/gluezilla/configure.ac 2007-11-21 03:26:26 UTC (rev
90060)
@@ -148,6 +148,7 @@
AC_OUTPUT([
Makefile
+build/Makefile
src/Makefile
tests/browser/Makefile
])
Modified: branches/mono-1-2-6/gluezilla/src/ChangeLog
===================================================================
--- branches/mono-1-2-6/gluezilla/src/ChangeLog 2007-11-21 02:42:20 UTC (rev
90059)
+++ branches/mono-1-2-6/gluezilla/src/ChangeLog 2007-11-21 03:26:26 UTC (rev
90060)
@@ -1,3 +1,7 @@
+2007-11-19 Wade Berrier <[EMAIL PROTECTED]>
+
+ * Makefile.am: include windows.mak in EXTRA_DIST
+
2007-11-18 Andreia Gaita <[EMAIL PROTECTED]>
[Backport to 1.2.6]
* windows.mak: embed manifest file in a release build so windows
Modified: branches/mono-1-2-6/gluezilla/src/Makefile.am
===================================================================
--- branches/mono-1-2-6/gluezilla/src/Makefile.am 2007-11-21 02:42:20 UTC
(rev 90059)
+++ branches/mono-1-2-6/gluezilla/src/Makefile.am 2007-11-21 03:26:26 UTC
(rev 90060)
@@ -25,7 +25,7 @@
libgluezilla_la_LIBADD = $(GLUEZILLA_LIBS)
-EXTRA_DIST = FastDelegate.h
+EXTRA_DIST = FastDelegate.h windows.mak
debug:
LD_LIBRARY_PATH=.libs gdb
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
