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

diff --git a/kcontrol/konqhtml/Makefile.am b/kcontrol/konqhtml/Makefile.am
new file mode 100644
index 000000000..87cf8a664
--- /dev/null
+++ b/kcontrol/konqhtml/Makefile.am
@@ -0,0 +1,26 @@
+AM_CPPFLAGS  = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kcontrol/input $(all_includes)
+AM_LDFLAGS =  $(all_libraries)
+
+METASOURCES = AUTO 
+
+kde_module_LTLIBRARIES = kcm_konqhtml.la
+
+kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
+			     javaopts.cpp pluginopts.cpp appearance.cpp \
+			     khttpoptdlg.cpp policydlg.cpp main.cpp \
+			     jspolicies.cpp nsconfigwidget.ui policies.cpp \
+			     domainlistview.cpp advancedTabOptions.ui \
+			     filteropts.cpp
+
+kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+kcm_konqhtml_la_LIBADD = -lkhtml -lkdeui
+
+xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot
+
+install-data-local: uninstall.desktop
+	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/nsplugin.desktop
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/khtml_appearance.desktop