[Kde-bindings] KDE/kdebindings/ruby

[Richard Dale]

SVN commit 731367 by rdale:

* Don't build the qtrubyinternal library anymore as it gave trouble on
  AMD64 machines and needed an '-fPIC' option there. Instead just
  include the qtruby sources in the korundum (and plasma) projects.

CCMAIL: kde-bindings at kde.org




 M  +6 -0      korundum/ChangeLog  
 M  +4 -1      korundum/src/CMakeLists.txt  
 M  +4 -1      plasma/src/CMakeLists.txt  
 M  +6 -0      qtruby/ChangeLog  
 M  +1 -26     qtruby/src/CMakeLists.txt  


--- trunk/KDE/kdebindings/ruby/korundum/ChangeLog #731366:731367
@@ -1,3 +1,9 @@
+2007-10-31  Richard Dale  <rdale at foton.es>
+
+	* Don't build the qtrubyinternal library anymore as it gave trouble on
+	  AMD64 machines and needed an '-fPIC' option there. Instead just
+	  include the qtruby sources in the korundum (and plasma) projects.
+
 2007-09-18  Richard Dale  <rdale at foton.es>
 
 	* Added a patch from  Matthias Kretz to use generic plugin code for loading a ruby plugin. 
--- trunk/KDE/kdebindings/ruby/korundum/src/CMakeLists.txt #731366:731367
@@ -6,6 +6,9 @@
 set(korundum_LIB_SRCS 
    Korundum.cpp 
    kdehandlers.cpp 
+   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/Qt.cpp
+   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/handlers.cpp
+   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/marshall_types.cpp
    )
 
 set(factory_SRCS
@@ -13,7 +16,7 @@
 
 kde4_add_library(korundum4 SHARED ${korundum_LIB_SRCS})
 
-target_link_libraries(korundum4 ${KDE4_KDECORE_LIBS} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokekde qtrubyinternal )
+target_link_libraries(korundum4 ${KDE4_KDECORE_LIBS} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokekde )
 
 set_target_properties(korundum4 PROPERTIES PREFIX "")
 
--- trunk/KDE/kdebindings/ruby/plasma/src/CMakeLists.txt #731366:731367
@@ -4,11 +4,14 @@
 set(plasma_applet_LIB_SRCS 
    plasma.cpp 
    kdehandlers.cpp 
+   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/Qt.cpp
+   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/handlers.cpp
+   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/marshall_types.cpp
    )
 
 kde4_add_library(plasma_applet SHARED ${plasma_applet_LIB_SRCS})
 
-target_link_libraries(plasma_applet ${KDE4_KDECORE_LIBS} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokeplasma qtrubyinternal )
+target_link_libraries(plasma_applet ${KDE4_KDECORE_LIBS} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokeplasma )
 
 set_target_properties(plasma_applet PROPERTIES PREFIX "")
 install(TARGETS plasma_applet  DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR} )
--- trunk/KDE/kdebindings/ruby/qtruby/ChangeLog #731366:731367
@@ -1,3 +1,9 @@
+2007-10-31  Richard Dale  <rdale at foton.es>
+
+	* Don't build the qtrubyinternal library anymore as it gave trouble on
+	  AMD64 machines and needed an '-fPIC' option there. Instead just
+	  include the qtruby sources in the korundum (and plasma) projects.
+
 2007-10-30  Richard Dale  <rdale at foton.es>
 
 	* The Qt::KeyEvent#type method wasn't working. Fixes problem reported
--- trunk/KDE/kdebindings/ruby/qtruby/src/CMakeLists.txt #731366:731367
@@ -26,8 +26,7 @@
 
 target_link_libraries(qtruby4 ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokeqt)
 
-add_library(qtrubyinternal STATIC ${qtruby_LIB_SRCS})
-target_link_libraries(qtrubyinternal ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+# target_link_libraries(qtrubyinternal ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY})
 
 set_target_properties(qtruby4 PROPERTIES PREFIX "")
 
@@ -41,27 +40,3 @@
 
 
 ########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR)
-#
-#noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb marshall_types.h \
-#		marshall_basetypes.h marshall_complex.h marshall_primitives.h
-#
-#noinst_LTLIBRARIES = libqtrubyinternal.la
-#libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp marshall_types.cpp
-#libqtrubyinternal_la_METASOURCES = AUTO
-#
-#rubylibdir = $(RUBY_SITEARCHDIR)
-#rubylib_LTLIBRARIES = qtruby4.la
-#qtruby4_la_SOURCES = 
-#qtruby4_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
-#qtruby4_la_LIBADD = libqtrubyinternal.la $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \
-#						$(LIB_QTOPENGL) $(LIB_QTSQL) $(LIB_QTCORE) $(LIB_QTXML) \
-# 						$(top_builddir)/smoke/qt/libsmokeqt.la
-#
-#SUBDIRS = lib