[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 7413a80adb142f2ba3af31b9a43b6c683586e6c0
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 31 14:05:46 2002 +0000

            * Makefile.am:
            * kjs/Makefile.am:
            Slight improvements to rules that touch stamp files.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1244 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cbc6579..cdff4d8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-31  Darin Adler  <darin at apple.com>
+
+	* Makefile.am:
+	* kjs/Makefile.am:
+	Slight improvements to rules that touch stamp files.
+
 2002-05-28  Maciej Stachowiak  <mjs at apple.com>
 
 	* THANKS: Demangled.
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index cbc6579..cdff4d8 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-05-31  Darin Adler  <darin at apple.com>
+
+	* Makefile.am:
+	* kjs/Makefile.am:
+	Slight improvements to rules that touch stamp files.
+
 2002-05-28  Maciej Stachowiak  <mjs at apple.com>
 
 	* THANKS: Demangled.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index cbc6579..cdff4d8 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-05-31  Darin Adler  <darin at apple.com>
+
+	* Makefile.am:
+	* kjs/Makefile.am:
+	Slight improvements to rules that touch stamp files.
+
 2002-05-28  Maciej Stachowiak  <mjs at apple.com>
 
 	* THANKS: Demangled.
diff --git a/JavaScriptCore/Makefile.am b/JavaScriptCore/Makefile.am
index 9a19ad6..80a472d 100644
--- a/JavaScriptCore/Makefile.am
+++ b/JavaScriptCore/Makefile.am
@@ -13,8 +13,7 @@ BUILT_SOURCES = JavaScriptCore-stamp
 CLEANFILES = $(BUILT_SOURCES)
 
 JavaScriptCore-stamp: kjs/*.cpp kjs/*.h
-	pbxbuild -buildstyle $(BUILDSTYLE)
-	touch JavaScriptCore-stamp
+	pbxbuild -buildstyle $(BUILDSTYLE) && touch $@
 
 FRAMEWORK_NAME = JavaScriptCore
 FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_NAME).framework
@@ -44,4 +43,3 @@ embed:
 
 clean-am:
 	pbxbuild clean
-
diff --git a/JavaScriptCore/kjs/Makefile.am b/JavaScriptCore/kjs/Makefile.am
index 4a8e796..5c8cb20 100644
--- a/JavaScriptCore/kjs/Makefile.am
+++ b/JavaScriptCore/kjs/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
 YACCFLAGS = -d --output-file=grammar.cpp --file-prefix=grammar --name-prefix=kjsyy
 
 GRAMMAR_FILES = grammar.h grammar.cpp.h grammar.cpp
@@ -7,9 +5,7 @@ GRAMMAR_FILES = grammar.h grammar.cpp.h grammar.cpp
 $(GRAMMAR_FILES): grammar-stamp
 
 grammar-stamp: grammar.y
-	$(YACC) $(YACCFLAGS) $<
-	cp -f grammar.cpp.h grammar.h
-	touch $@
+	$(YACC) $(YACCFLAGS) $< && cp -f grammar.cpp.h grammar.h && touch $@
 
 LUT_FILES = math_object.lut.h lexer.lut.h array_object.lut.h date_object.lut.h string_object.lut.h number_object.lut.h
 

-- 
WebKit Debian packaging