Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


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

1 files changed, 41 insertions, 0 deletions

diff --git a/kxkb/Makefile.am b/kxkb/Makefile.am
new file mode 100644
index 000000000..8398e3946
--- /dev/null
+++ b/kxkb/Makefile.am
@@ -0,0 +1,41 @@
+INCLUDES= $(all_includes)
+METASOURCES = AUTO
+SUBDIRS = pics
+
+# it's basicly impossible to get this done with all the X headers used ;(
+KDE_OPTIONS = nofinal
+
+bin_PROGRAMS = 
+lib_LTLIBRARIES = 
+kdeinit_LTLIBRARIES = kxkb.la
+kde_module_LTLIBRARIES = kcm_keyboard.la
+
+kcm_keyboard_la_SOURCES = extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp \
+	kcmlayout.cpp kcmlayoutwidget.ui kcmmisc.cpp kcmmiscwidget.ui
+kcm_keyboard_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+kcm_keyboard_la_LIBADD = -lxkbfile $(XTESTLIB) $(LIB_KIO)
+
+#kxkb_la_includedir = .
+#kxkb_la_include_HEADERS = kxkb.h
+kxkb_la_SOURCES = extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp \
+	layoutmap.cpp kxkb.cpp kxkbtraywindow.cpp kxkb.skel
+kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kxkb_la_LIBADD = -lxkbfile -lX11 -lXext $(LIB_KDEUI)
+
+xdg_apps_DATA = keyboard.desktop keyboard_layout.desktop
+
+install-data-local: 
+	$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
+	$(INSTALL_DATA) $(srcdir)/kxkb_groups $(DESTDIR)$(kde_confdir)/kxkb_groups
+
+uninstall-local:
+	-rm -f $(DESTDIR)$(kde_confdir)/kxkb_groups
+
+servicesdir = $(kde_servicesdir)
+services_DATA = kxkb.desktop
+
+messages: rc.cpp
+	$(XGETTEXT) kxkb.cpp kxkbtraywindow.cpp rules.cpp extension.cpp pixmap.cpp kxkbbindings.cpp -o $(podir)/kxkb.pot
+	$(XGETTEXT) rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp rc.cpp kxkbbindings.cpp -o $(podir)/kcmlayout.pot 
+
+noinst_HEADERS = kxkbtraywindow.h kxkbconfig.h layoutmap.h