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/kdelibs@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 37 insertions, 0 deletions

diff --git a/khtml/java/Makefile.am b/khtml/java/Makefile.am
new file mode 100644
index 000000000..b29e2349c
--- /dev/null
+++ b/khtml/java/Makefile.am
@@ -0,0 +1,37 @@
+KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
+
+noinst_LTLIBRARIES = libkjava.la
+libkjava_la_SOURCES = kjavaapplet.cpp kjavaappletcontext.cpp \
+	kjavaappletserver.cpp kjavaappletwidget.cpp kjavaprocess.cpp \
+	kjavadownloader.cpp 
+
+noinst_HEADERS = kjavaappletwidget.h kqeventutil.h kxeventutil.h \
+                 kjavaapplet.h kjavaappletcontext.h \
+                 kjavaappletserver.h kjavaprocess.h kjavaappletviewer.h
+
+METASOURCES = AUTO
+
+libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
+libkjava_la_LIBADD = $(LIB_KPARTS)
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/khtml \
+	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+	$(all_includes) 
+
+kjavadata_DATA = kjava.jar kjava.policy pluginsinfo
+kjavadatadir = $(kde_datadir)/kjava/
+
+kjavaiconsdir = $(kde_datadir)/kjava/icons
+kjavaicons_ICON = AUTO
+
+SUBDIRS = . tests dummy
+
+kde_module_LTLIBRARIES= kjavaappletviewer.la
+kjavaappletviewer_la_SOURCES= kjavaapplet.cpp kjavaappletcontext.cpp \
+        kjavaappletserver.cpp kjavaappletwidget.cpp kjavaprocess.cpp \
+        kjavadownloader.cpp kjavaappletviewer.cpp
+
+kjavaappletviewer_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
+kjavaappletviewer_la_LIBADD= $(LIB_KPARTS)
+
+kde_services_DATA= kjavaappletviewer.desktop