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, 40 insertions, 0 deletions

diff --git a/kcontrol/kicker/Makefile.am b/kcontrol/kicker/Makefile.am
new file mode 100644
index 000000000..2fa9a2ad9
--- /dev/null
+++ b/kcontrol/kicker/Makefile.am
@@ -0,0 +1,40 @@
+kde_module_LTLIBRARIES = kcm_kicker.la
+
+kcm_kicker_la_SOURCES = positiontab.ui hidingtab.ui lookandfeeltab.ui menutab.ui \
+			positiontab_impl.cpp hidingtab_impl.cpp lookandfeeltab_impl.cpp \
+			menutab_impl.cpp extensionInfo.cpp main.cpp main.skel \
+                        advancedOptions.ui advancedDialog.cpp \
+                        positionconfig.cpp hidingconfig.cpp menuconfig.cpp lookandfeelconfig.cpp
+
+kcm_kicker_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_KIO) $(LIB_KUTILS)
+AM_CPPFLAGS = -I$(top_srcdir)/kicker/kicker/core -I$(top_srcdir)/kicker/libkicker \
+	-I$(top_builddir)/kicker/libkicker -I$(srcdir)/../background $(all_includes)
+
+METASOURCES = AUTO
+
+noinst_HEADERS = positiontab_impl.h hidingtab_impl.h lookandfeeltab_impl.h menutab_impl.h \
+		extensionInfo.h main.h  advancedDialog.h
+
+# Translation of tiles is used by lookandfeeltab_impl.cpp
+# Tile names are transformed to words with title case
+messages: rc.cpp
+	(cd ../../kicker/data/tiles ; ls *_tiny_up.png) | perl -p -e \
+	  's/(.*)_tiny_up\.png/i18n\(\"\u$$1\"\)\;/; s/[_ ]+(.)/ \u$$1/g' >> rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kcmkicker.pot
+
+xdg_apps_DATA = panel.desktop
+EXTRA_DIST = $(xdg_apps_DATA)
+
+kcmkicker_data3_DATA = kicker_config.desktop \
+                kicker_config_arrangement.desktop kicker_config_hiding.desktop \
+                kicker_config_menus.desktop kicker_config_appearance.desktop
+kcmkicker_data3dir = $(kde_appsdir)/.hidden
+
+install-data-local: uninstall.desktop
+	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/LookNFeel
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/LookNFeel/panel.desktop
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/LookNFeel/panel_appearance.desktop
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(xdg_appsdir)/panel_appearance.desktop
+
+extensionInfo.lo: ../../kicker/libkicker/kickerSettings.h