From 977af731ca5f76799cdb7aa14e4f071c38f34999 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jan 2010 01:22:29 +0000 Subject: [PATCH] * 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 --- dcopjava/binding/Makefile.am | 9 ++++++--- dcoppython/lib/Makefile.am | 2 +- dcoppython/shell/gen_marshal_code.py | 16 ++++++++-------- kdejava/koala/Makefile.am | 4 ++-- kdejava/koala/kdejava/Makefile.am | 5 +++-- kdejava/koala/org/kde/koala/Makefile.am | 4 ++-- kjsembed/cpptests/jsaccess/Makefile.am | 2 +- kjsembed/plugins/Makefile.am | 8 ++++---- kjsembed/stdlib/Makefile.am | 2 +- korundum/rubylib/korundum/Makefile.am | 2 +- korundum/rubylib/korundum/configure.in.in | 2 ++ korundum/rubylib/korundum/lib/KDE/Makefile.am | 4 ++-- qtjava/designer/juic/bin/juic | 10 +--------- qtjava/javalib/Makefile.am | 2 +- qtjava/javalib/org/kde/qt/Makefile.am | 2 +- qtjava/javalib/qtjava/Makefile.am | 4 +++- qtruby/bin/rbqtapi | 2 +- qtruby/bin/rbqtsh | 2 +- qtruby/rubylib/designer/uilib/Makefile.am | 2 +- qtruby/rubylib/qtruby/Makefile.am | 2 +- qtruby/rubylib/qtruby/Qt.cpp | 12 ++++++------ qtruby/rubylib/qtruby/configure.in.in | 2 ++ qtruby/rubylib/qtruby/lib/Makefile.am | 2 +- qtruby/rubylib/qtruby/lib/Qt/Makefile.am | 2 +- 24 files changed, 53 insertions(+), 51 deletions(-) diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am index 922e59ff..3e919043 100644 --- a/dcopjava/binding/Makefile.am +++ b/dcopjava/binding/Makefile.am @@ -6,10 +6,13 @@ libjavadcop_la_LIBADD = $(LIB_KDECORE) INCLUDES = $(jni_includes) $(all_includes) -client.cpp: org_kde_DCOP_Client.h +client.$(OBJEXT): org_kde_DCOP_Client.h -org_kde_DCOP_Client.h: org/kde/DCOP/Client.class - CLASSPATH=$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client +client.lo: org_kde_DCOP_Client.h + +org_kde_DCOP_Client.h: + $(MAKE) -C org + $(JAVAH) -classpath .:$(srcdir) -jni org.kde.DCOP.Client SUBDIRS = org diff --git a/dcoppython/lib/Makefile.am b/dcoppython/lib/Makefile.am index 99dbac94..c72a0662 100644 --- a/dcoppython/lib/Makefile.am +++ b/dcoppython/lib/Makefile.am @@ -1,4 +1,4 @@ pyt_DATA = pydcop.py -pytdir = $(PYTHONMODDIR) +pytdir = $(PYTHONMODDIR)/site-packages diff --git a/dcoppython/shell/gen_marshal_code.py b/dcoppython/shell/gen_marshal_code.py index 73cb1fd0..c24c8760 100644 --- a/dcoppython/shell/gen_marshal_code.py +++ b/dcoppython/shell/gen_marshal_code.py @@ -119,21 +119,21 @@ class DocType: def __init__(self, type): self.type = type - self.demarshal_as = None - self.as = [] + self.demarshal_asme = None + self.asme = [] self.info = [] - def add_as(self, as): - if self.demarshal_as == None: self.demarshal_as = as - self.as += [as] + def add_asme(self, asme): + if self.demarshal_asme == None: self.demarshal_asme = asme + self.asme += [asme] def add_info(self,info): self.info += [info] def xml(self): return ['' % self.type, - ' %s' % self.demarshal_as] + \ - [' %s' % as for as in self.as ] + \ + ' %s' % self.demarshal_asme] + \ + [' %s' % asme for asme in self.asme ] + \ [' %s' % info for info in self.info ] + \ [''] @@ -186,7 +186,7 @@ for l in in_file.readlines(): if m: doc_cmd, rest = m.groups() if doc_cmd=="as": - doc_types[current_type].add_as(rest) + doc_types[current_type].add_asme(rest) if doc_cmd=="info": doc_types[current_type].add_info(rest) continue 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@ diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am index eda2e3e1..175344b1 100644 --- a/kjsembed/cpptests/jsaccess/Makefile.am +++ b/kjsembed/cpptests/jsaccess/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -bin_PROGRAMS = jsaccess +noinst_PROGRAMS = jsaccess jsaccess_SOURCES = jsaccess.cpp jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index f3071bb2..ff2d954a 100644 --- a/kjsembed/plugins/Makefile.am +++ b/kjsembed/plugins/Makefile.am @@ -1,8 +1,8 @@ INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -kde_module_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la \ - libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la +kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la +noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la METASOURCES = AUTO # the Plugin's source, library search path, and link libraries @@ -33,6 +33,6 @@ libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la # this is where the desktop file will go plugindesktopdir = $(kde_servicesdir) -plugindesktop_DATA = customobject_plugin.desktop customqobject_plugin.desktop imagefx_plugin.desktop\ - qprocess_plugin.desktop kfileitem_plugin.desktop +plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop +noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop diff --git a/kjsembed/stdlib/Makefile.am b/kjsembed/stdlib/Makefile.am index bd7e241a..279c2bf6 100644 --- a/kjsembed/stdlib/Makefile.am +++ b/kjsembed/stdlib/Makefile.am @@ -1,5 +1,5 @@ # -*- makefile -*- jslibdir = $(kde_datadir)/kjsembed -jslib_DATA = cmdline.js +jslib_SCRIPTS = cmdline.js diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am index c135f4e9..56427288 100644 --- a/korundum/rubylib/korundum/Makefile.am +++ b/korundum/rubylib/korundum/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) -rubylibdir = $(RUBY_SITEARCHDIR) +rubylibdir = $(RUBY_ARCHDIR) rubylib_LTLIBRARIES = korundum.la korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 korundum_la_METASOURCES = AUTO diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in index de265e6d..81ad0bcb 100644 --- a/korundum/rubylib/korundum/configure.in.in +++ b/korundum/rubylib/korundum/configure.in.in @@ -7,9 +7,11 @@ else RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` + RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR]) AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_SITEARCHDIR) + AC_SUBST(RUBY_RUBYLIBDIR) AC_SUBST(RUBY_SITEDIR) fi diff --git a/korundum/rubylib/korundum/lib/KDE/Makefile.am b/korundum/rubylib/korundum/lib/KDE/Makefile.am index 3f7b0c53..e69bcb05 100644 --- a/korundum/rubylib/korundum/lib/KDE/Makefile.am +++ b/korundum/rubylib/korundum/lib/KDE/Makefile.am @@ -1,5 +1,5 @@ -kderubylibdir = $(RUBY_SITEDIR)/KDE +kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE kderubylib_DATA = korundum.rb -rubylibdir = $(RUBY_SITEDIR) +rubylibdir = $(RUBY_RUBYLIBDIR) rubylib_DATA = Korundum.rb diff --git a/qtjava/designer/juic/bin/juic b/qtjava/designer/juic/bin/juic index 8104ac9b..b01cadc7 100755 --- a/qtjava/designer/juic/bin/juic +++ b/qtjava/designer/juic/bin/juic @@ -14,13 +14,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -getAbsolutePath() { - ls=$(ls -l $1) - pushd `dirname ${ls##* }` >/dev/null - pwd -P - popd >/dev/null -} - usage() { juic=$(basename $0) cat <@)'` RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` + RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG]) AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_SITEDIR) + AC_SUBST(RUBY_RUBYLIBDIR) AC_SUBST(RUBY_LIBDIR) AC_SUBST(RUBY_LIBRUBYARG) fi diff --git a/qtruby/rubylib/qtruby/lib/Makefile.am b/qtruby/rubylib/qtruby/lib/Makefile.am index e8f6457a..b8298cb7 100644 --- a/qtruby/rubylib/qtruby/lib/Makefile.am +++ b/qtruby/rubylib/qtruby/lib/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = Qt -rubylibdir = $(RUBY_SITEDIR) +rubylibdir = $(RUBY_RUBYLIBDIR) rubylib_DATA = Qt.rb diff --git a/qtruby/rubylib/qtruby/lib/Qt/Makefile.am b/qtruby/rubylib/qtruby/lib/Qt/Makefile.am index 267582ef..b20eb92e 100644 --- a/qtruby/rubylib/qtruby/lib/Qt/Makefile.am +++ b/qtruby/rubylib/qtruby/lib/Qt/Makefile.am @@ -1,2 +1,2 @@ -qtrubylibdir = $(RUBY_SITEDIR)/Qt +qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt qtrubylib_DATA = qtruby.rb