diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-09 01:22:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-09 01:22:29 +0000 |
| commit | 977af731ca5f76799cdb7aa14e4f071c38f34999 (patch) | |
| tree | 9c547df2958c0e903c6b4563e220a25316cde504 /kdejava/koala | |
| parent | dff3f779e70064ee7d7a34a3afb003c7999f8994 (diff) | |
| download | tdebindings-977af731ca5f76799cdb7aa14e4f071c38f34999.tar.gz tdebindings-977af731ca5f76799cdb7aa14e4f071c38f34999.zip | |
* Updated automake/autoconf
* Detects Python 2.6
* Various compilation fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1071924 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdejava/koala')
| -rw-r--r-- | kdejava/koala/Makefile.am | 4 | ||||
| -rw-r--r-- | kdejava/koala/kdejava/Makefile.am | 5 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/Makefile.am | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/kdejava/koala/Makefile.am b/kdejava/koala/Makefile.am index cb48a314..a0d75ae8 100644 --- a/kdejava/koala/Makefile.am +++ b/kdejava/koala/Makefile.am @@ -1,10 +1,10 @@ ####### kdevelop will overwrite this part!!! (begin)########## -bin_PROGRAMS = koala +noinst_PROGRAMS = koala ## INCLUDES were found outside kdevelop specific part koala_SOURCES = main.cpp -koala_LDADD = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET) +koala_LDADD = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET) SUBDIRS = org kdejava diff --git a/kdejava/koala/kdejava/Makefile.am b/kdejava/koala/kdejava/Makefile.am index 2e90f46a..68f079c2 100644 --- a/kdejava/koala/kdejava/Makefile.am +++ b/kdejava/koala/kdejava/Makefile.am @@ -1,5 +1,6 @@ ####### kdevelop will overwrite this part!!! (begin)########## -lib_LTLIBRARIES = libkdejava.la +jniloc_LTLIBRARIES = libkdejava.la +jnilocdir = $(libdir)/jni ## INCLUDES were found outside kdevelop specific part @@ -34,4 +35,4 @@ libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR): libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) -KDE_OPTIONS = qtonly +KDE_OPTIONS = qtonly nofinal diff --git a/kdejava/koala/org/kde/koala/Makefile.am b/kdejava/koala/org/kde/koala/Makefile.am index 163870dc..bae2af61 100644 --- a/kdejava/koala/org/kde/koala/Makefile.am +++ b/kdejava/koala/org/kde/koala/Makefile.am @@ -11,7 +11,7 @@ noinst_JAVA = $(EXTRA_DIST) #install-data-hook: uninstall-javaJAVA JAVAROOT = ../../.. -CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir) -JAVACFLAGS = -classpath $(CLASSPATH) +CLASSPATH = ../../..:../../../../../qtjava/javalib/qtjava.jar:. +JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1 # Prevent stupid automake from putting JAVAC=javac in Makefile.in JAVAC = @JAVAC@ |