[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    koffice/lib/kross
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2006-02-05 10:18:44
Message-ID: 1139134724.667756.31954.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 505894 by sebsauer:

Hopefully a fix for the at koffice.devel reported compile-problem.

- reordered *_la_LDFLAGS. Have $(all_libraries) at the end of the line.
- s/$(LIB_KDECORE)/$(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE)/ in \
*_la_LIBADD. We just link them explicit now even if not used within the plugins :-/

Knut, could you please try to recompile with scripting enabled and provide feedback \
                if the prob got fixed? Very much thanks in advance! :-)
CC_MAIL: knutmj@online.no

Anybody else an idea while it failed to compile at all?
CC_MAIL: koffice-devel@kde.org



 M  +2 -2      python/Makefile.am  
 M  +1 -0      python/pythoninterpreter.cpp  
 M  +0 -1      python/pythoninterpreter.h  
 M  +1 -1      python/pythonscript.cpp  
 M  +2 -4      ruby/Makefile.am  


--- trunk/koffice/lib/kross/python/Makefile.am #505893:505894
@@ -2,7 +2,7 @@
 
 kde_module_LTLIBRARIES = krosspython.la
 
-krosspython_la_LDFLAGS = $(LIBPYTHON) $(PYTHONLIB)  $(all_libraries) $(KDE_PLUGIN) \
$(VER_INFO) -module +krosspython_la_LDFLAGS = $(LIBPYTHON) $(PYTHONLIB) -module \
$(KDE_PLUGIN) $(all_libraries) $(VER_INFO)  
 krosspython_la_SOURCES = \
     pythonextension.cpp \
@@ -14,7 +14,7 @@
 
 krosspython_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) \
     CXX/libkrosspythoncxx.la \
     ../api/libkrossapi.la \
     ../main/libkrossmain.la
--- trunk/koffice/lib/kross/python/pythoninterpreter.cpp #505893:505894
@@ -25,6 +25,7 @@
 #include "../api/variant.h"
 
 #include <kglobal.h>
+#include <kdebug.h>
 #include <kstandarddirs.h>
 
 #if defined(Q_WS_WIN)
--- trunk/koffice/lib/kross/python/pythoninterpreter.h #505893:505894
@@ -28,7 +28,6 @@
 #include "../main/scriptcontainer.h"
 
 #include <qstring.h>
-#include <kdebug.h>
 
 namespace Kross { namespace Python {
 
--- trunk/koffice/lib/kross/python/pythonscript.cpp #505893:505894
@@ -23,7 +23,7 @@
 #include "pythonsecurity.h"
 #include "../main/scriptcontainer.h"
 
-#include <kapplication.h>
+//#include <kapplication.h>
 #include <kdebug.h>
 
 using namespace Kross::Python;
--- trunk/koffice/lib/kross/ruby/Makefile.am #505893:505894
@@ -3,15 +3,13 @@
 INCLUDES = -I$(top_srcdir)/lib/kross -I$(RUBY_ARCHDIR) $(all_includes)
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = krossruby.la
-krossruby_la_LDFLAGS = -module $(RUBY_LIBRUBYARG) $(all_libraries) $(KDE_PLUGIN) \
$(VER_INFO)  +krossruby_la_LDFLAGS = $(RUBY_LIBRUBYARG) -module $(KDE_PLUGIN) \
$(all_libraries) $(VER_INFO)  
 krossruby_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) \
     ../api/libkrossapi.la \
     ../main/libkrossmain.la
 
-
-
 noinst_HEADERS = rubyinterpreter.h rubyextension.h rubyscript.h rubyconfig.h
 krossruby_la_SOURCES = rubyinterpreter.cpp rubyextension.cpp rubyscript.cpp \
rubymodule.cpp _______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


[prev in list] [next in list] [prev in thread] [next in thread]