--- a/Make.proto Mon Jun 20 10:30:39 2011 +0000
+++ b/Make.proto Mon Jun 20 11:41:45 2011 +0000
@@ -63,13 +63,15 @@
all:: preMake classLibRule postMake
-pre_objs:: uzbl/uzbl-core update-svn-revision
+pre_objs:: WebKitRenderer.$(shell uname -m) update-svn-revision
+
+WebKitRenderer.$(shell uname -m): uzbl/uzbl-core
+ cp uzbl/uzbl-core WebKitRenderer.$(shell uname -m)
uzbl/uzbl-core:
$(MAKE) -C uzbl uzbl-core
-
update-svn-revision:
if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
svnversion -n > .svnversion; \
Binary file WebKitRenderer.x86_64 has changed
--- a/stx_libwebkit.st Mon Jun 20 10:30:39 2011 +0000
+++ b/stx_libwebkit.st Mon Jun 20 11:41:45 2011 +0000
@@ -41,10 +41,18 @@
"allows for additional rules to be added to the make.proto file."
^ '
+WebKitRenderer.$(shell uname -m): uzbl/uzbl-core
+', Character tab , 'cp uzbl/uzbl-core WebKitRenderer.$(shell uname -m)
+
uzbl/uzbl-core:
', Character tab , '$(MAKE) -C uzbl uzbl-core
+
+clean::
+', Character tab , '$(MAKE) -C uzbl clean
+', Character tab , 'rm WebKitRenderer.$(shell uname -m)
'
+
"Created: / 22-08-2006 / 23:59:16 / cg"
"Modified: / 09-06-2011 / 14:29:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -52,7 +60,7 @@
additionalTargets_make_dot_proto
"allows for additional targets to be added to the make.proto file."
- ^ 'uzbl/uzbl-core'
+ ^ 'WebKitRenderer.$(shell uname -m)'
"Created: / 22-08-2006 / 23:53:33 / cg"
"Modified: / 09-06-2011 / 14:28:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -130,7 +138,7 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"'20M'"$"
+ ^ "$SVN-Revision:"'22M'"$"
! !
!stx_libwebkit class methodsFor:'documentation'!
--- a/uzbl/Makefile Mon Jun 20 10:30:39 2011 +0000
+++ b/uzbl/Makefile Mon Jun 20 11:41:45 2011 +0000
@@ -49,6 +49,8 @@
uzbl-core: ${OBJ}
+../WebKitRenderer: ${OBJ}
+
uzbl-browser: uzbl-core
# the 'tests' target can never be up to date