[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 9ad6b5217cbaaf3323e468f9fcd6affc92319b50
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 19 22:32:06 2001 +0000

    Added
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/kwq/qt/Makefile.in
similarity index 67%
copy from WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
copy to WebCore/kwq/qt/Makefile.in
index fa6e5c6..b6631c3 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/kwq/qt/Makefile.in
@@ -3,52 +3,40 @@
 # Makefile
 #
 # $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
 #
 #======================================================================
 # set top source dir relative to this directory
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
-OBJECTS = $(CXXOBJECTS) 
+OBJECTS = $(CXXOBJECTS)
 
-LIBRARY = libkhtmldom.a
+LIBRARY = lib_qt.a
 
-CLEAN_FILES = $(OBJECTS) \
-	$(LIBRARY) \
-	$(NULL)
+CLEAN_FILES = *.o \
+    *.a \
+    $(NULL)
 
 #----------------------------------------------------------------------
 # Set flags for this directory
 
 CXXFLAGS = $(BASECXXFLAGS) \
-	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I../css \
-	-I../html \
-	-I../misc \
-	-I../xml \
-	-I.. \
-	-I. \
-	$(NULL)
+    -DQ_DELETING_VOID_UNDEFINED \
+    -DQT_NO_TEXTCODEC \
+    -DQT_NO_DATASTREAM \
+    -D_KWQ_COMPLETE_ \
+    -D_KWQ_IOSTREAM_ \
+    -I.. \
+    -I. \
+    $(NULL)
 
 DEPFLAGS = $(CXXFLAGS)
 
@@ -57,10 +45,12 @@ DEPFLAGS = $(CXXFLAGS)
 
 all: $(OBJECTS) $(LIBRARY)
 
-$(LIBRARY): $(CXXOBJECTS)
+$(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
+depend:
+
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/src/kwq/qt/Makefile.in
similarity index 67%
copy from WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
copy to WebCore/src/kwq/qt/Makefile.in
index fa6e5c6..b6631c3 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kwq/qt/Makefile.in
@@ -3,52 +3,40 @@
 # Makefile
 #
 # $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
 #
 #======================================================================
 # set top source dir relative to this directory
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
-OBJECTS = $(CXXOBJECTS) 
+OBJECTS = $(CXXOBJECTS)
 
-LIBRARY = libkhtmldom.a
+LIBRARY = lib_qt.a
 
-CLEAN_FILES = $(OBJECTS) \
-	$(LIBRARY) \
-	$(NULL)
+CLEAN_FILES = *.o \
+    *.a \
+    $(NULL)
 
 #----------------------------------------------------------------------
 # Set flags for this directory
 
 CXXFLAGS = $(BASECXXFLAGS) \
-	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I../css \
-	-I../html \
-	-I../misc \
-	-I../xml \
-	-I.. \
-	-I. \
-	$(NULL)
+    -DQ_DELETING_VOID_UNDEFINED \
+    -DQT_NO_TEXTCODEC \
+    -DQT_NO_DATASTREAM \
+    -D_KWQ_COMPLETE_ \
+    -D_KWQ_IOSTREAM_ \
+    -I.. \
+    -I. \
+    $(NULL)
 
 DEPFLAGS = $(CXXFLAGS)
 
@@ -57,10 +45,12 @@ DEPFLAGS = $(CXXFLAGS)
 
 all: $(OBJECTS) $(LIBRARY)
 
-$(LIBRARY): $(CXXOBJECTS)
+$(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
+depend:
+
 #----------------------------------------------------------------------
 # include make rules boilerplate
 

-- 
WebKit Debian packaging