From kde-commits  Tue Aug 02 13:26:34 2005
From: Luciano Montanaro <mikelima () cirulla ! net>
Date: Tue, 02 Aug 2005 13:26:34 +0000
To: kde-commits
Subject: kdenox/konq-embed
Message-Id: <1122989194.552033.18527.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112299311420127

SVN commit 442364 by montanaro:

Fix cross compilation for sh4-linux


 M  +2 -1      kdesrc/khtml/Makefile.am  
 M  +1 -1      prepare_kde_src  


--- trunk/kdenox/konq-embed/kdesrc/khtml/Makefile.am #442363:442364
@@ -21,7 +21,7 @@
 
 AM_CPPFLAGS = -UQT_NO_COMPAT 
 
-#AM_CXXFLAGS += -DTABLE_DEBUG
+#AM_CXXFLAGS = -DTABLE_DEBUG
 #AM_CXXFLAGS += -DDEBUG_LAYOUT
 #AM_CXXFLAGS += -DDEBUG_EVENTS
 #AM_CXXFLAGS += -DTOKEN_DEBUG
@@ -74,6 +74,7 @@
 		 design.h testkhtml.h khtml_pagecache.h
 
 INCLUDES = -I$(top_builddir)/konq-embed/kdesrc/kssl \
+	   -I$(top_builddir)/konq-embed/kdesrc \
 	   -I$(top_srcdir)/konq-embed/kdesrc/kdecore \
 	   -I$(top_srcdir)/konq-embed/kdesrc/kjs \
 	   -I$(top_srcdir)/konq-embed/kdesrc/kio \
--- trunk/kdenox/konq-embed/prepare_kde_src #442363:442364
@@ -366,7 +366,7 @@
 	 ./kdesrc/khtml/misc/Makefile.am \
 	 ./kdesrc/khtml/ecma/Makefile.am \
 	 ./kdesrc/khtml/css/Makefile.am ; do
-    perl -pi -e "s,\\$\(all_includes\),-I\\$\(top_builddir\)/konq-embed/kdesrc/kssl -I\\$\(top_srcdir\)/konq-embed/dropin -I\\$\(top_srcdir\)/konq-embed/kdesrc/kio -I\\$\(top_srcdir\)/konq-embed/kdesrc/kdecore -I\\$\(top_srcdir\)/konq-embed/kdesrc/kutils -I\\$\(srcdir\)/../.. -I\\$\(srcdir\)/.. -I\\$\(srcdir\)/../misc -I\\$\(srcdir\)/../misc -I\\$\(srcdir\)/../css -I\\$\(srcdir\)/../dom -I\\$\(srcdir\)/../xml -I\\$\(srcdir\)/../html -I\\$\(top_srcdir\)/konq-embed/dropin/kio -I\\$\(srcdir\)/../.. -I\\$\(srcdir\)/../../kjs -I\\$\(top_srcdir\)/konq-embed/dropin/kssl -I\\$\(srcdir\)/../../../dropin/khtml -I\\$\(top_srcdir\)/konq-embed/dropin/khtml/java \\\$\(QT_INCLUDES\) \\$\(X_INCLUDES\) \\$\(all_includes\)," $i
+    perl -pi -e "s,\\$\(all_includes\),-I\\$\(top_builddir\)/konq-embed/kdesrc -I\\$\(top_builddir\)/konq-embed/kdesrc/kssl -I\\$\(top_srcdir\)/konq-embed/dropin -I\\$\(top_srcdir\)/konq-embed/kdesrc/kio -I\\$\(top_srcdir\)/konq-embed/kdesrc/kdecore -I\\$\(top_srcdir\)/konq-embed/kdesrc/kutils -I\\$\(srcdir\)/../.. -I\\$\(srcdir\)/.. -I\\$\(srcdir\)/../misc -I\\$\(srcdir\)/../misc -I\\$\(srcdir\)/../css -I\\$\(srcdir\)/../dom -I\\$\(srcdir\)/../xml -I\\$\(srcdir\)/../html -I\\$\(top_srcdir\)/konq-embed/dropin/kio -I\\$\(srcdir\)/../.. -I\\$\(srcdir\)/../../kjs -I\\$\(top_srcdir\)/konq-embed/dropin/kssl -I\\$\(srcdir\)/../../../dropin/khtml -I\\$\(top_srcdir\)/konq-embed/dropin/khtml/java \\\$\(QT_INCLUDES\) \\$\(X_INCLUDES\) \\$\(all_includes\)," $i
     perl -pi -e "s,-DQT_NO_CAST_ASCII,,g" $i
     echo "KDE_OPTIONS = qtonly" >> $i
 done;