Final automake fixes; compilation now succeeds under Ubuntu Karmic

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1069187 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 296 insertions, 10 deletions

diff --git a/kate/data/opal.xml b/kate/data/opal.xml
new file mode 100644
index 000000000..ab087ee59
--- /dev/null
+++ b/kate/data/opal.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="OPAL" version="1.1" kateversion="2.1" section="Sources" extensions="*.impl;*.sign" mimetype="" author="Sebastian Pipping (webmaster@hartwork.org)">
+
+	<highlighting>
+
+		<list name="opal_keywords">
+			<item>ALL</item>
+			<item>AND</item>
+			<item>ANDIF</item>
+			<item>ANY</item>
+			<item>AS</item>
+			<item>ASSERT</item>
+			<item>AXM</item>
+			<item>COMPLETELY</item>
+			<item>DATA</item>
+			<item>DEF</item>
+			<item>DERIVE</item>
+			<item>DFD</item>
+			<item>DISCRIMINATORS</item>
+			<item>ELSE</item>
+			<item>EX</item>
+			<item>EXTERNAL</item>
+			<item>FI</item>
+			<item>FIX</item>
+			<item>FUN</item>
+			<item>IF</item>
+			<item>IMPLEMENTATION</item>
+			<item>IMPLIES</item>
+			<item>IMPORT</item>
+			<item>IN</item>
+			<item>INHERIT</item>
+			<item>INJECTIONS</item>
+			<item>INTERFACE</item>
+			<item>INTERNAL</item>
+			<item>LAW</item>
+			<item>LAZY</item>
+			<item>LEFTASSOC</item>
+			<item>LET</item>
+			<item>MODULE</item>
+			<item>NOT</item>
+			<item>ONLY</item>
+			<item>OR</item>
+			<item>ORIF</item>
+			<item>OTHERWISE</item>
+			<item>POST</item>
+			<item>PRE</item>
+			<item>PRED</item>
+			<item>PRIORITY</item>
+			<item>PROPERTIES</item>
+			<item>REALIZES</item>
+			<item>REQUIRE</item>
+			<item>RIGHTASSOC</item>
+			<item>SELECTORS</item>
+			<item>SIGNATURE</item>
+			<item>SORT</item>
+			<item>SPC</item>
+			<item>SPEC</item>
+			<item>SPECIFICATION</item>
+			<item>STRUCTURE</item>
+			<item>THE</item>
+			<item>THEN</item>
+			<item>THEORY</item>
+			<item>THM</item>
+			<item>TYPE</item>
+			<item>UNIQ</item>
+			<item>WHERE</item>
+		</list>
+		<list name="opal_sorts">
+			<item>aEntry</item>
+			<item>agent</item>
+			<item>align</item>
+			<item>anchor</item>
+			<item>ans</item>
+			<item>arg</item>
+			<item>arg1</item>
+			<item>arg2</item>
+			<item>array</item>
+			<item>arrowWhere</item>
+			<item>bag</item>
+			<item>bitmap</item>
+			<item>bool</item>
+			<item>bstree</item>
+			<item>byte</item>
+			<item>callback</item>
+			<item>canvasEditor</item>
+			<item>capStyle</item>
+			<item>channel</item>
+			<item>char</item>
+			<item>childstat</item>
+			<item>codom</item>
+			<item>codomFrom</item>
+			<item>codomTo</item>
+			<item>color</item>
+			<item>colorModel</item>
+			<item>com</item>
+			<item>composeOp</item>
+			<item>config</item>
+			<item>configCom</item>
+			<item>cursor</item>
+			<item>dArray</item>
+			<item>data</item>
+			<item>data1</item>
+			<item>data11</item>
+			<item>data2</item>
+			<item>data21</item>
+			<item>data3</item>
+			<item>data31</item>
+			<item>data4</item>
+			<item>data41</item>
+			<item>dataFrom</item>
+			<item>dataTo</item>
+			<item>defaultPrio</item>
+			<item>denotation</item>
+			<item>device</item>
+			<item>dist</item>
+			<item>distOut</item>
+			<item>dom</item>
+			<item>domFrom</item>
+			<item>domTo</item>
+			<item>drawing</item>
+			<item>dyn</item>
+			<item>emitter</item>
+			<item>env</item>
+			<item>event</item>
+			<item>eventInfo</item>
+			<item>file</item>
+			<item>filemode</item>
+			<item>filestat</item>
+			<item>filetype</item>
+			<item>first</item>
+			<item>first1</item>
+			<item>first2</item>
+			<item>first3</item>
+			<item>fission</item>
+			<item>fmt</item>
+			<item>font</item>
+			<item>from</item>
+			<item>from1</item>
+			<item>from2</item>
+			<item>funct</item>
+			<item>group</item>
+			<item>groupid</item>
+			<item>heap</item>
+			<item>iconfig</item>
+			<item>image</item>
+			<item>in</item>
+			<item>inData</item>
+			<item>index</item>
+			<item>inode</item>
+			<item>input</item>
+			<item>int</item>
+			<item>inter</item>
+			<item>interdom</item>
+			<item>interpreter</item>
+			<item>iseq</item>
+			<item>items</item>
+			<item>joinStyle</item>
+			<item>justifyHow</item>
+			<item>long</item>
+			<item>manager</item>
+			<item>managerRequest</item>
+			<item>map</item>
+			<item>mapEntry</item>
+			<item>mark</item>
+			<item>mid</item>
+			<item>modifier</item>
+			<item>nat</item>
+			<item>natMap</item>
+			<item>OBJECT</item>
+			<item>option</item>
+			<item>orient</item>
+			<item>out</item>
+			<item>outData</item>
+			<item>output</item>
+			<item>packOp</item>
+			<item>pair</item>
+			<item>parser</item>
+			<item>permission</item>
+			<item>point</item>
+			<item>positionRequest</item>
+			<item>process</item>
+			<item>procstat</item>
+			<item>quad</item>
+			<item>range</item>
+			<item>real</item>
+			<item>regulator</item>
+			<item>rel</item>
+			<item>relief</item>
+			<item>res</item>
+			<item>res1</item>
+			<item>res2</item>
+			<item>result</item>
+			<item>role</item>
+			<item>sap</item>
+			<item>script</item>
+			<item>scroller</item>
+			<item>scrollView</item>
+			<item>scrollWindow</item>
+			<item>searchOpt</item>
+			<item>second</item>
+			<item>seekMode</item>
+			<item>selector</item>
+			<item>semaphor</item>
+			<item>seq</item>
+			<item>seqEntry</item>
+			<item>set</item>
+			<item>setEntry</item>
+			<item>short</item>
+			<item>sigaction</item>
+			<item>sighandler</item>
+			<item>sigmask</item>
+			<item>signal</item>
+			<item>size</item>
+			<item>sizeRequest</item>
+			<item>some</item>
+			<item>sreal</item>
+			<item>state</item>
+			<item>stateId</item>
+			<item>stateRequest</item>
+			<item>string</item>
+			<item>subrel</item>
+			<item>tag</item>
+			<item>textEditor</item>
+			<item>time</item>
+			<item>to</item>
+			<item>tree</item>
+			<item>triple</item>
+			<item>union</item>
+			<item>user</item>
+			<item>userid</item>
+			<item>version</item>
+			<item>view</item>
+			<item>void</item>
+			<item>wconfig</item>
+			<item>wconfigCom</item>
+			<item>wday</item>
+			<item>widget</item>
+			<item>window</item>
+			<item>wrapStyle</item>
+		</list>
+		<list name="opal_other">
+			<item>true</item>
+			<item>false</item>
+		</list>
+
+		<contexts>
+			<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+				<keyword attribute="Keyword" context="#stay" String="opal_keywords"/>
+				<keyword attribute="Sort" context="#stay" String="opal_sorts"/>
+				<keyword attribute="Decimal" context="#stay" String="opal_other"/>
+				<Int attribute="Decimal" context="#stay"/>
+				<DetectChar attribute="String" context="String" char="&quot;"/>
+				<StringDetect attribute="Comment" context="SingLineCom" String="-- "/>
+				<Detect2Chars attribute="Comment" context="MultLineCom" char="/" char1="*"/>
+			</context>
+			
+			<context attribute="String" lineEndContext="#stay" name="String">
+				<Detect2Chars attribute="String" context="#stay" char="\" char1="&quot;"/>
+				<DetectChar attribute="String" context="#pop" char="&quot;"/>
+			</context>
+			
+			<context attribute="Comment" lineEndContext="#pop" name="SingLineCom"/>
+			
+			<context attribute="Comment" lineEndContext="#stay" name="MultLineCom">
+				<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"/>
+			</context>
+		</contexts>
+
+		<itemDatas>
+			<itemData name="Normal Text" defStyleNum="dsNormal"/>
+			<itemData name="Keyword"     defStyleNum="dsKeyword" color="#0000ff"/>
+			<itemData name="Sort"        defStyleNum="dsDataType" color="#0000ff"/>
+			<itemData name="Decimal"     defStyleNum="dsString"/>
+			<itemData name="String"      defStyleNum="dsString"/>
+			<itemData name="Comment"     defStyleNum="dsOthers"/>
+		</itemDatas>
+
+	</highlighting>
+
+	<general>
+		<comments>
+			<comment name="singleLine" start="-- "/>
+			<comment name="multiLine" start="/*" end="*/"/>
+		</comments>
+		<keywords casesensitive="1"/>
+	</general>
+
+</language>
\ No newline at end of file
diff --git a/kdeui/Makefile.am b/kdeui/Makefile.am
index 70157796a..761c1db63 100644
--- a/kdeui/Makefile.am
+++ b/kdeui/Makefile.am
@@ -18,8 +18,7 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-SUBDIRS = . tests about
-DIST_SUBDIRS = kdetrayproxy
+SUBDIRS = . tests about kdetrayproxy
 
 INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/interfaces $(all_includes)
 
diff --git a/kdeui/kdetrayproxy/Makefile.am b/kdeui/kdetrayproxy/Makefile.am
index a1e803af0..01dc87082 100644
--- a/kdeui/kdetrayproxy/Makefile.am
+++ b/kdeui/kdetrayproxy/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_kdetrayproxy.la
 INCLUDES= -I$(top_srcdir)/kded $(all_includes)
 kded_kdetrayproxy_la_SOURCES = kdetrayproxy.cpp module.cpp module.skel
 kded_kdetrayproxy_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kded/libkdeinit_kded.la
+kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 METASOURCES = AUTO
 
diff --git a/kio/Makefile.am b/kio/Makefile.am
index d1fe7c6b2..8349d4038 100644
--- a/kio/Makefile.am
+++ b/kio/Makefile.am
@@ -20,8 +20,7 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(srcdir)/.. $(all_includes) $(SSL_INCLUDES)
 
-SUBDIRS = kssl kio bookmarks kfile . pics tests kioexec httpfilter
-DIST_SUBDIRS = kpasswdserver misc
+SUBDIRS = kssl kio bookmarks kfile . pics tests kioexec httpfilter misc kpasswdserver
 
 lib_LTLIBRARIES = libkio.la
 
diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am
index 4ddb85be4..eb2ee3bc4 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/kio/kpasswdserver/Makefile.am
@@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
 kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
 kded_kpasswdserver_la_METASOURCES = AUTO
 kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kded/libkdeinit_kded.la
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/misc/kpac/Makefile.am b/kio/misc/kpac/Makefile.am
index 33d7d0196..796a9771c 100644
--- a/kio/misc/kpac/Makefile.am
+++ b/kio/misc/kpac/Makefile.am
@@ -11,8 +11,7 @@ kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
                              downloader.cpp discovery.cpp
 kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
-	$(top_builddir)/dcop/libDCOP.la $(top_builddir)/kded/libkdeinit_kded.la \
-	$(LIB_KDECORE) $(LIBRESOLV)
+	$(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIBRESOLV)
 
 kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
 kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
diff --git a/kio/misc/kssld/Makefile.am b/kio/misc/kssld/Makefile.am
index 24faf2e28..a87478d65 100644
--- a/kio/misc/kssld/Makefile.am
+++ b/kio/misc/kssld/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/kio/kss
 kde_module_LTLIBRARIES = kded_kssld.la
 
 kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kded/libkdeinit_kded.la $(LIB_KDECORE)
+kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
 kded_kssld_la_SOURCES = kssld.cpp kssld.skel
 
 METASOURCES = AUTO
diff --git a/kio/misc/kwalletd/Makefile.am b/kio/misc/kwalletd/Makefile.am
index 1c198c46e..6876ba596 100644
--- a/kio/misc/kwalletd/Makefile.am
+++ b/kio/misc/kwalletd/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top
 kde_module_LTLIBRARIES = kded_kwalletd.la
 
 kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/kded/libkdeinit_kded.la
+kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KDEUI)
 kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui
 
 METASOURCES = AUTO