From 36d7821740208b486c2a2e02ee29f5ced494e5c3 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 2 Jan 2010 22:25:48 +0000 Subject: [PATCH] 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 --- kate/data/opal.xml | 289 +++++++++++++++++++++++++++++++++ kdeui/Makefile.am | 3 +- kdeui/kdetrayproxy/Makefile.am | 2 +- kio/Makefile.am | 3 +- kio/kpasswdserver/Makefile.am | 2 +- kio/misc/kpac/Makefile.am | 3 +- kio/misc/kssld/Makefile.am | 2 +- kio/misc/kwalletd/Makefile.am | 2 +- 8 files changed, 296 insertions(+), 10 deletions(-) create mode 100644 kate/data/opal.xml 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 @@ + + + + + + + + ALL + AND + ANDIF + ANY + AS + ASSERT + AXM + COMPLETELY + DATA + DEF + DERIVE + DFD + DISCRIMINATORS + ELSE + EX + EXTERNAL + FI + FIX + FUN + IF + IMPLEMENTATION + IMPLIES + IMPORT + IN + INHERIT + INJECTIONS + INTERFACE + INTERNAL + LAW + LAZY + LEFTASSOC + LET + MODULE + NOT + ONLY + OR + ORIF + OTHERWISE + POST + PRE + PRED + PRIORITY + PROPERTIES + REALIZES + REQUIRE + RIGHTASSOC + SELECTORS + SIGNATURE + SORT + SPC + SPEC + SPECIFICATION + STRUCTURE + THE + THEN + THEORY + THM + TYPE + UNIQ + WHERE + + + aEntry + agent + align + anchor + ans + arg + arg1 + arg2 + array + arrowWhere + bag + bitmap + bool + bstree + byte + callback + canvasEditor + capStyle + channel + char + childstat + codom + codomFrom + codomTo + color + colorModel + com + composeOp + config + configCom + cursor + dArray + data + data1 + data11 + data2 + data21 + data3 + data31 + data4 + data41 + dataFrom + dataTo + defaultPrio + denotation + device + dist + distOut + dom + domFrom + domTo + drawing + dyn + emitter + env + event + eventInfo + file + filemode + filestat + filetype + first + first1 + first2 + first3 + fission + fmt + font + from + from1 + from2 + funct + group + groupid + heap + iconfig + image + in + inData + index + inode + input + int + inter + interdom + interpreter + iseq + items + joinStyle + justifyHow + long + manager + managerRequest + map + mapEntry + mark + mid + modifier + nat + natMap + OBJECT + option + orient + out + outData + output + packOp + pair + parser + permission + point + positionRequest + process + procstat + quad + range + real + regulator + rel + relief + res + res1 + res2 + result + role + sap + script + scroller + scrollView + scrollWindow + searchOpt + second + seekMode + selector + semaphor + seq + seqEntry + set + setEntry + short + sigaction + sighandler + sigmask + signal + size + sizeRequest + some + sreal + state + stateId + stateRequest + string + subrel + tag + textEditor + time + to + tree + triple + union + user + userid + version + view + void + wconfig + wconfigCom + wday + widget + window + wrapStyle + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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