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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 5ff4b00b28bd939b4a2e5e3e515b17c45d62f3f5
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 20 02:01:06 2001 +0000

    Initial makefile.in
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/kwq/Makefile.in
similarity index 66%
copy from WebCore/khtml/dom/Makefile.in.apple
copy to WebCore/kwq/Makefile.in
index fa6e5c6..c5c0a14 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/kwq/Makefile.in
@@ -12,19 +12,31 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-SOURCES = $(wildcard *.cpp)
+SOURCES = $(wildcard *.mm)
 HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
-OBJECTS = $(CXXOBJECTS) 
+MMOBJECTS = \
+	KWQApplication.o \
+	KWQBrush.o \
+	KWQFont.o \
+	KWQFontMetrics.o \
+	KWQPainter.o \
+	KWQPen.o \
+	KWQPixmap.o \
+	KWQString.o \
+	KWQWMatrix.o \
+	KWQWidget.o \
+	$(NULL)
+
+OBJECTS = $(MMOBJECTS) 
 
-LIBRARY = libkhtmldom.a
+LIBRARY = libkwq.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
@@ -33,22 +45,12 @@ CLEAN_FILES = $(OBJECTS) \
 #----------------------------------------------------------------------
 # 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)
+CMMFLAGS = $(BASECXXFLAGS) \
+    -I$(TOPSRCDIR) \
+    -I$(TOPSRCDIR)/src/kwq \
+    -I$(TOPSRCDIR)/src/kwq/qt \
+    -I. \
+    $(NULL)
 
 DEPFLAGS = $(CXXFLAGS)
 
@@ -57,8 +59,8 @@ DEPFLAGS = $(CXXFLAGS)
 
 all: $(OBJECTS) $(LIBRARY)
 
-$(LIBRARY): $(CXXOBJECTS)
-	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
+$(LIBRARY): $(MMOBJECTS)
+	$(AR) $(ARFLAGS) $(LIBRARY) $(MMOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
 #----------------------------------------------------------------------
diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/src/kwq/Makefile.in
similarity index 66%
copy from WebCore/khtml/dom/Makefile.in.apple
copy to WebCore/src/kwq/Makefile.in
index fa6e5c6..c5c0a14 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kwq/Makefile.in
@@ -12,19 +12,31 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-SOURCES = $(wildcard *.cpp)
+SOURCES = $(wildcard *.mm)
 HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
-OBJECTS = $(CXXOBJECTS) 
+MMOBJECTS = \
+	KWQApplication.o \
+	KWQBrush.o \
+	KWQFont.o \
+	KWQFontMetrics.o \
+	KWQPainter.o \
+	KWQPen.o \
+	KWQPixmap.o \
+	KWQString.o \
+	KWQWMatrix.o \
+	KWQWidget.o \
+	$(NULL)
+
+OBJECTS = $(MMOBJECTS) 
 
-LIBRARY = libkhtmldom.a
+LIBRARY = libkwq.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
@@ -33,22 +45,12 @@ CLEAN_FILES = $(OBJECTS) \
 #----------------------------------------------------------------------
 # 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)
+CMMFLAGS = $(BASECXXFLAGS) \
+    -I$(TOPSRCDIR) \
+    -I$(TOPSRCDIR)/src/kwq \
+    -I$(TOPSRCDIR)/src/kwq/qt \
+    -I. \
+    $(NULL)
 
 DEPFLAGS = $(CXXFLAGS)
 
@@ -57,8 +59,8 @@ DEPFLAGS = $(CXXFLAGS)
 
 all: $(OBJECTS) $(LIBRARY)
 
-$(LIBRARY): $(CXXOBJECTS)
-	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
+$(LIBRARY): $(MMOBJECTS)
+	$(AR) $(ARFLAGS) $(LIBRARY) $(MMOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
 #----------------------------------------------------------------------

-- 
WebKit Debian packaging