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

diff --git a/kcontrol/background/Makefile.am b/kcontrol/background/Makefile.am
new file mode 100644
index 000000000..e1d847ead
--- /dev/null
+++ b/kcontrol/background/Makefile.am
@@ -0,0 +1,27 @@
+SUBDIRS = . pics
+
+AM_CPPFLAGS = -I$(top_srcdir)/libkonq $(all_includes)
+
+kde_module_LTLIBRARIES = kcm_background.la
+
+kcm_background_la_SOURCES = main.cpp
+kcm_background_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
+kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_KFILE) $(LIB_KNEWSTUFF)
+
+METASOURCES = AUTO
+
+noinst_HEADERS = main.h \
+ bgrender.h bgsettings.h \
+ bgdialog.h bgadvanced.h bgwallpaper.h bgdefaults.h bgmonitor.h
+
+noinst_LTLIBRARIES = libbgnd.la libkcmbgnd.la
+libbgnd_la_SOURCES = bgrender.cpp bgsettings.cpp
+libkcmbgnd_la_SOURCES = bgdialog.cpp bgdialog_ui.ui bgwallpaper_ui.ui \
+                bgwallpaper.cpp bgadvanced_ui.ui bgadvanced.cpp bgmonitor.cpp
+
+main.lo: bgdialog_ui.h
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kcmbackground.pot
+
+xdg_apps_DATA = background.desktop