[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:42:34 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b1b1adaeff9f3ebd84c9db168c7a60d51758bf17
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 4 16:45:03 2001 +0000
Added some more complete dependency checking to the build system
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/css/MakeSystemChanges.sh b/WebCore/khtml/css/MakeSystemChanges.sh
index 1f814de..8396ad9 100644
--- a/WebCore/khtml/css/MakeSystemChanges.sh
+++ b/WebCore/khtml/css/MakeSystemChanges.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-FILES='Makefile.am'
+FILES='Makefile.am css_extensionsimpl.cpp css_extensionsimpl.h'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
diff --git a/WebCore/khtml/css/Makefile.in.apple b/WebCore/khtml/css/Makefile.in.apple
index eb4cc7f..43d8279 100644
--- a/WebCore/khtml/css/Makefile.in.apple
+++ b/WebCore/khtml/css/Makefile.in.apple
@@ -18,8 +18,9 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out css_extensionsimpl.o,$(ALLOBJECTS))
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
+CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
VALUEFILES = \
cssvalues.c \
@@ -35,7 +36,7 @@ PROPFILES = \
CFILES = $(VALUEFILES) $(PROPFILES)
-OBJECTS = $(CFILES) $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlcss.a
@@ -48,6 +49,7 @@ 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 \
@@ -65,7 +67,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
@@ -77,6 +79,16 @@ $(VALUEFILES):
$(PROPFILES):
sh ./makeprop
+depend: Makefile.dep
+
+Makefile.dep: $(VALUEFILES) $(PROPFILES) $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
+#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/khtml/dom/MakeSystemChanges.sh b/WebCore/khtml/dom/MakeSystemChanges.sh
index 1f814de..ca7f073 100644
--- a/WebCore/khtml/dom/MakeSystemChanges.sh
+++ b/WebCore/khtml/dom/MakeSystemChanges.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-FILES='Makefile.am'
+FILES='Makefile.am css_extensions.cpp css_extensions.h'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/khtml/dom/Makefile.in.apple
index 6bff843..30d91c6 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/khtml/dom/Makefile.in.apple
@@ -18,8 +18,9 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out css_extensions.o,$(ALLOBJECTS))
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
+CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
@@ -33,6 +34,7 @@ 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 \
@@ -50,12 +52,22 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
+#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/khtml/ecma/Makefile.in.apple b/WebCore/khtml/ecma/Makefile.in.apple
index 637a6cd..f5463f5 100644
--- a/WebCore/khtml/ecma/Makefile.in.apple
+++ b/WebCore/khtml/ecma/Makefile.in.apple
@@ -3,9 +3,6 @@
# Makefile
#
# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
#
#======================================================================
# set top source dir relative to this directory
@@ -18,6 +15,8 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
@@ -35,6 +34,7 @@ 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/kdecore \
@@ -50,11 +50,10 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
-
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
@@ -63,11 +62,21 @@ $(LIBRARY): $(CXXOBJECTS)
$(PROGRAM): testecma.o
$(CC) -o $@ $< -L. -lkhtmlecma
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
kjs_window.cpp: kjs_window.moc
kjs_window.moc:
touch $@
#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
+#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/khtml/java/MakeSystemChanges.sh b/WebCore/khtml/java/MakeSystemChanges.sh
index b4f74c2..7d3a1d4 100644
--- a/WebCore/khtml/java/MakeSystemChanges.sh
+++ b/WebCore/khtml/java/MakeSystemChanges.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-FILES='Makefile.am configure.in.in'
+FILES='Makefile.am configure.in.in javaembed.cpp'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
diff --git a/WebCore/khtml/java/Makefile.in.apple b/WebCore/khtml/java/Makefile.in.apple
index c097564..aa9475d 100644
--- a/WebCore/khtml/java/Makefile.in.apple
+++ b/WebCore/khtml/java/Makefile.in.apple
@@ -19,8 +19,9 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out javaembed.o,$(ALLOBJECTS))
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
+CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
@@ -46,12 +47,16 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
kjavaapplet.cpp: kjavaapplet.moc
kjavaapplet.moc:
@@ -78,6 +83,11 @@ kjavaprocess.moc:
touch $@
#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
+#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/khtml/misc/Makefile.in.apple b/WebCore/khtml/misc/Makefile.in.apple
index de5ddec..8450be7 100644
--- a/WebCore/khtml/misc/Makefile.in.apple
+++ b/WebCore/khtml/misc/Makefile.in.apple
@@ -18,6 +18,8 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
TAGFILES = \
@@ -47,6 +49,7 @@ 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/kdecore \
@@ -62,12 +65,17 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
loader.cpp: loader.moc
loader.moc:
touch loader.moc
@@ -82,6 +90,11 @@ $(ATTRSFILES):
./makeattrs
#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
+#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/khtml/xml/Makefile.in.apple b/WebCore/khtml/xml/Makefile.in.apple
index 1201eaf..2d06b3a 100644
--- a/WebCore/khtml/xml/Makefile.in.apple
+++ b/WebCore/khtml/xml/Makefile.in.apple
@@ -19,6 +19,9 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
+
CXXOBJECTS = \
dom2_eventsimpl.o \
dom2_rangeimpl.o \
@@ -46,6 +49,7 @@ 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/kdecore \
@@ -62,6 +66,11 @@ CXXFLAGS = $(BASECXXFLAGS) \
all: $(OBJECTS) $(LIBRARY)
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
dom_docimpl.cpp: dom_docimpl.moc
dom_docimpl.moc:
touch $@
@@ -74,6 +83,11 @@ $(LIBRARY): $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
+#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/css/MakeSystemChanges.sh b/WebCore/src/kdelibs/khtml/css/MakeSystemChanges.sh
index 1f814de..8396ad9 100644
--- a/WebCore/src/kdelibs/khtml/css/MakeSystemChanges.sh
+++ b/WebCore/src/kdelibs/khtml/css/MakeSystemChanges.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-FILES='Makefile.am'
+FILES='Makefile.am css_extensionsimpl.cpp css_extensionsimpl.h'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
index eb4cc7f..43d8279 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
@@ -18,8 +18,9 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out css_extensionsimpl.o,$(ALLOBJECTS))
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
+CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
VALUEFILES = \
cssvalues.c \
@@ -35,7 +36,7 @@ PROPFILES = \
CFILES = $(VALUEFILES) $(PROPFILES)
-OBJECTS = $(CFILES) $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlcss.a
@@ -48,6 +49,7 @@ 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 \
@@ -65,7 +67,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
@@ -77,6 +79,16 @@ $(VALUEFILES):
$(PROPFILES):
sh ./makeprop
+depend: Makefile.dep
+
+Makefile.dep: $(VALUEFILES) $(PROPFILES) $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
+#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kdelibs/khtml/dom/MakeSystemChanges.sh b/WebCore/src/kdelibs/khtml/dom/MakeSystemChanges.sh
index 1f814de..ca7f073 100644
--- a/WebCore/src/kdelibs/khtml/dom/MakeSystemChanges.sh
+++ b/WebCore/src/kdelibs/khtml/dom/MakeSystemChanges.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-FILES='Makefile.am'
+FILES='Makefile.am css_extensions.cpp css_extensions.h'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
index 6bff843..30d91c6 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
@@ -18,8 +18,9 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out css_extensions.o,$(ALLOBJECTS))
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
+CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
@@ -33,6 +34,7 @@ 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 \
@@ -50,12 +52,22 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
+#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple b/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
index 637a6cd..f5463f5 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
@@ -3,9 +3,6 @@
# Makefile
#
# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
#
#======================================================================
# set top source dir relative to this directory
@@ -18,6 +15,8 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
@@ -35,6 +34,7 @@ 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/kdecore \
@@ -50,11 +50,10 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
-
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
@@ -63,11 +62,21 @@ $(LIBRARY): $(CXXOBJECTS)
$(PROGRAM): testecma.o
$(CC) -o $@ $< -L. -lkhtmlecma
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
kjs_window.cpp: kjs_window.moc
kjs_window.moc:
touch $@
#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
+#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/java/MakeSystemChanges.sh b/WebCore/src/kdelibs/khtml/java/MakeSystemChanges.sh
index b4f74c2..7d3a1d4 100644
--- a/WebCore/src/kdelibs/khtml/java/MakeSystemChanges.sh
+++ b/WebCore/src/kdelibs/khtml/java/MakeSystemChanges.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-FILES='Makefile.am configure.in.in'
+FILES='Makefile.am configure.in.in javaembed.cpp'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.in.apple b/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
index c097564..aa9475d 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
@@ -19,8 +19,9 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out javaembed.o,$(ALLOBJECTS))
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
+CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
@@ -46,12 +47,16 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
kjavaapplet.cpp: kjavaapplet.moc
kjavaapplet.moc:
@@ -78,6 +83,11 @@ kjavaprocess.moc:
touch $@
#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
+#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
index de5ddec..8450be7 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
@@ -18,6 +18,8 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
TAGFILES = \
@@ -47,6 +49,7 @@ 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/kdecore \
@@ -62,12 +65,17 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: Makefile.dep $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
loader.cpp: loader.moc
loader.moc:
touch loader.moc
@@ -82,6 +90,11 @@ $(ATTRSFILES):
./makeattrs
#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
+#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
index 1201eaf..2d06b3a 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
@@ -19,6 +19,9 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
+
CXXOBJECTS = \
dom2_eventsimpl.o \
dom2_rangeimpl.o \
@@ -46,6 +49,7 @@ 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/kdecore \
@@ -62,6 +66,11 @@ CXXFLAGS = $(BASECXXFLAGS) \
all: $(OBJECTS) $(LIBRARY)
+depend: Makefile.dep
+
+Makefile.dep: $(SOURCES) $(HEADERS)
+ $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
+
dom_docimpl.cpp: dom_docimpl.moc
dom_docimpl.moc:
touch $@
@@ -74,6 +83,11 @@ $(LIBRARY): $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
+#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list