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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 75252e62cc314a423d9392df33bf5ae798065b9a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 20 15:05:33 2001 +0000

    Tweak to handle skipping the compilation of javaembed.cpp now that
    this skipping is no longer handled by MakeSystemChanges.sh
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/java/Makefile.in b/WebCore/khtml/java/Makefile.in
index 8e96b68..a551eff 100644
--- a/WebCore/khtml/java/Makefile.in
+++ b/WebCore/khtml/java/Makefile.in
@@ -20,7 +20,9 @@ include $(TOPSRCDIR)/Makefile.vars
 
 SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+SKIPOBJECTS = javaembed.o
+CXXOBJECTS = $(filter-out $(SKIPOBJECTS),$(ALLOBJECTS))
 
 OBJECTS = $(CXXOBJECTS) 
 
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.in b/WebCore/src/kdelibs/khtml/java/Makefile.in
index 8e96b68..a551eff 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.in
@@ -20,7 +20,9 @@ include $(TOPSRCDIR)/Makefile.vars
 
 SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+SKIPOBJECTS = javaembed.o
+CXXOBJECTS = $(filter-out $(SKIPOBJECTS),$(ALLOBJECTS))
 
 OBJECTS = $(CXXOBJECTS) 
 

-- 
WebKit Debian packaging