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

List:       kde-commits
Subject:    KDE/kdelibs
From:       Simon Hausmann <hausmann () kde ! org>
Date:       2005-09-18 8:35:52
Message-ID: 1127032552.602898.9306.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 461595 by hausmann:

- use env.subdirs for kdecore
- kconfig_compiler unfortunately needs QtGui (as it links against kdecore)
  kdecore still doesn't build because of the moc detection. I guess we need exactly the same
  moc logic that unsermake and am_edit have


 M  +1 -2      SConstruct  
 M  +12 -1     kdecore/SConscript  
 M  +1 -1      kdecore/kconfig_compiler/SConscript  


--- trunk/KDE/kdelibs/SConstruct #461594:461595
@@ -63,8 +63,7 @@
 libltdl
 kdefx
 mimetypes
-kdecore/network
-kdecore/svgicons
+kdecore
 """
 # kdecore kunittest kdeui
 
--- trunk/KDE/kdelibs/kdecore/SConscript #461594:461595
@@ -3,6 +3,8 @@
 Import('env')
 
 env.subdirs('kconfig_compiler')
+env.subdirs('network')
+env.subdirs('svgicons')
 
 core_files="""
 libintl.cpp kapplication.cpp kauthorized.cpp ktoolinvocation_x11.cpp
@@ -35,7 +37,8 @@
 ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp
 kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
 kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp
-kqiodevicegzip_p.cpp ktimezones.cpp kmath.cpp"""
+kqiodevicegzip_p.cpp ktimezones.cpp kmath.cpp
+"""
 
 inst_headers="""
 kconfig.h kconfigskeleton.h
@@ -62,6 +65,14 @@
 kdemacros.h kde_file.h ktimezones.h kmdcodec.h kmath.h
 """
 
+#obj = env.qt4obj('shlib', env)
+#obj.vnum = '6.0.2'
+#obj.target = 'libkdecore'
+#obj.source = core_files
+#obj.uselib = 'QTCORE QT QT3SUPPORT KDE4'
+#obj.libs   = env.join('network', 'libkdecorenetwork')
+#obj.execute()
+
 """
 INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore/network $(all_includes) $(LIBART_CFLAGS)
 if include_SVGICONS
--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/SConscript #461594:461595
@@ -6,7 +6,7 @@
 obj.target = 'kconfig_compiler'
 obj.source = 'kconfig_compiler.cpp '
 obj.libs   = '../libkdecore.la '
-obj.uselib = 'QTCORE QT3SUPPORT KDE4'
+obj.uselib = 'QTCORE QTGUI QT3SUPPORT QT KDE4'
 obj.execute()
 
 """
[prev in list] [next in list] [prev in thread] [next in thread]