[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 05f4833cf443765396a6ef37ce1daf509745e82f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 29 19:00:21 2001 +0000

    Added make system support files
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/css/.cvsignore b/WebCore/khtml/css/.cvsignore
index 892db93..2b4f5d6 100644
--- a/WebCore/khtml/css/.cvsignore
+++ b/WebCore/khtml/css/.cvsignore
@@ -1,9 +1,8 @@
 Makefile
+Makefile.am
 Makefile.in
-*.strip
-cssproperties.c
-cssproperties.h
-cssproperties.gperf
-cssvalues.c
-cssvalues.h
-cssvalues.gperf
+*.kde
+*.dep
+*.moc
+*.gperf
+*.c
diff --git a/WebCore/khtml/dom/MakeSystemChanges.sh b/WebCore/khtml/css/MakeSystemChanges.sh
similarity index 100%
copy from WebCore/khtml/dom/MakeSystemChanges.sh
copy to WebCore/khtml/css/MakeSystemChanges.sh
diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/khtml/css/Makefile.in.apple
similarity index 76%
copy from WebCore/khtml/dom/Makefile.in.apple
copy to WebCore/khtml/css/Makefile.in.apple
index 9811ebc..d74ed93 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/khtml/css/Makefile.in.apple
@@ -19,14 +19,29 @@ include $(TOPSRCDIR)/Makefile.vars
 # Set variables for this directory
 
 ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out css_extensions.o,$(ALLOBJECTS))
+CXXOBJECTS = $(filter-out css_extensionsimpl.o,$(ALLOBJECTS))
 
-OBJECTS = $(CXXOBJECTS) 
+VALUEFILES = \
+	cssvalues.c \
+	cssvalues.h \
+	cssvalues.gperf \
+	$(NULL)
+
+PROPFILES = \
+	cssproperties.c \
+	cssproperties.h \
+	cssproperties.gperf \
+	$(NULL)
+
+CFILES = $(VALUEFILES) $(PROPFILES)
 
-LIBRARY = libkhtmldom.a
+OBJECTS = $(CFILES) $(CXXOBJECTS)
+
+LIBRARY = libkhtmlcss.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
+	$(CFILES) \
 	$(NULL)
 
 #----------------------------------------------------------------------
@@ -38,7 +53,7 @@ CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I../css \
+	-I../dom \
 	-I../html \
 	-I../misc \
 	-I../xml \
@@ -51,10 +66,16 @@ CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
 
 all: $(OBJECTS) $(LIBRARY)
 
-$(LIBRARY): $(CXXOBJECTS)
+$(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
+$(VALUEFILES):
+	sh ./makevalues
+
+$(PROPFILES):
+	sh ./makeprop
+
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/src/kdelibs/khtml/css/.cvsignore b/WebCore/src/kdelibs/khtml/css/.cvsignore
index 892db93..2b4f5d6 100644
--- a/WebCore/src/kdelibs/khtml/css/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/css/.cvsignore
@@ -1,9 +1,8 @@
 Makefile
+Makefile.am
 Makefile.in
-*.strip
-cssproperties.c
-cssproperties.h
-cssproperties.gperf
-cssvalues.c
-cssvalues.h
-cssvalues.gperf
+*.kde
+*.dep
+*.moc
+*.gperf
+*.c
diff --git a/WebCore/khtml/dom/MakeSystemChanges.sh b/WebCore/src/kdelibs/khtml/css/MakeSystemChanges.sh
similarity index 100%
copy from WebCore/khtml/dom/MakeSystemChanges.sh
copy to WebCore/src/kdelibs/khtml/css/MakeSystemChanges.sh
diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
similarity index 76%
copy from WebCore/khtml/dom/Makefile.in.apple
copy to WebCore/src/kdelibs/khtml/css/Makefile.in.apple
index 9811ebc..d74ed93 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
@@ -19,14 +19,29 @@ include $(TOPSRCDIR)/Makefile.vars
 # Set variables for this directory
 
 ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out css_extensions.o,$(ALLOBJECTS))
+CXXOBJECTS = $(filter-out css_extensionsimpl.o,$(ALLOBJECTS))
 
-OBJECTS = $(CXXOBJECTS) 
+VALUEFILES = \
+	cssvalues.c \
+	cssvalues.h \
+	cssvalues.gperf \
+	$(NULL)
+
+PROPFILES = \
+	cssproperties.c \
+	cssproperties.h \
+	cssproperties.gperf \
+	$(NULL)
+
+CFILES = $(VALUEFILES) $(PROPFILES)
 
-LIBRARY = libkhtmldom.a
+OBJECTS = $(CFILES) $(CXXOBJECTS)
+
+LIBRARY = libkhtmlcss.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
+	$(CFILES) \
 	$(NULL)
 
 #----------------------------------------------------------------------
@@ -38,7 +53,7 @@ CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I../css \
+	-I../dom \
 	-I../html \
 	-I../misc \
 	-I../xml \
@@ -51,10 +66,16 @@ CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
 
 all: $(OBJECTS) $(LIBRARY)
 
-$(LIBRARY): $(CXXOBJECTS)
+$(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
+$(VALUEFILES):
+	sh ./makevalues
+
+$(PROPFILES):
+	sh ./makeprop
+
 #----------------------------------------------------------------------
 # include make rules boilerplate
 

-- 
WebKit Debian packaging