OTHER: Waf updates, install headers in the right place.

Author: Tobias Rundstrom

src/clients/lib/python/wscript

@@ -11,7 +11,7 @@ def build(bld):
   obj.env["plugin_CCFLAGS"] += ["-Wno-unused-function", "-Wno-unused-label"]
   import distutils
   import distutils.sysconfig
-  obj.install_in = distutils.sysconfig.get_python_lib(plat_specific=True)
+  obj.install_in = "LIBDIR_python"
 
 def configure(conf):
   try:
@@ -26,6 +26,8 @@ def configure(conf):
   if not h.run():
     return False
 
+  conf.env["LIBDIR_python"] = distutils.sysconfig.get_python_lib(plat_specific=True)
+
   return conf.check_tool('pyrexc', tooldir=os.path.abspath('xmmsenv'))
 
 def set_options(opt):

src/clients/lib/ruby/wscript

@@ -9,7 +9,7 @@ def build(bld):
   obj.source = ['rb_xmmsclient_main.c', 'rb_xmmsclient.c', 'rb_result.c']
   obj.uselib_local = 'xmmsclient'
   obj.uselib = 'ruby'
-  obj.install_in = obj.env["ARCHDIR_ruby"]
+  obj.install_in = "ARCHDIR_ruby"
 
   # glib
   obj = bld.create_obj('cc', 'plugin')
@@ -18,7 +18,7 @@ def build(bld):
   obj.source = ['rb_xmmsclient_glib.c']
   obj.uselib_local = 'xmmsclient'
   obj.uselib = 'ruby glib-2.0'
-  obj.install_in = obj.env["ARCHDIR_ruby"]
+  obj.install_in = "ARCHDIR_ruby"
 
   # TODO - ECORE
 

src/include/wscript_build

@@ -2,5 +2,5 @@ import os
 paths = ['xmms', 'xmmsc', 'xmmsclient']
 for p in paths:
   f = [os.path.join(p, a) for a in os.listdir(os.path.join('src','include',p)) if a.endswith('.h')]
-  install_files('PREFIX', os.path.join('include', os.path.basename(p)), " ".join(f))
-install_files('PREFIX', os.path.join('include', 'xmms'), os.path.join('xmms', 'xmms_defs.h'))
+  install_files('PREFIX', os.path.join('include', 'xmms2', os.path.basename(p)), " ".join(f))
+install_files('PREFIX', os.path.join('include', 'xmms2'), os.path.join('xmms', 'xmms_defs.h'))

src/lib/xmmsipc/wscript

@@ -17,7 +17,7 @@ def build(bld):
   obj.includes='. ../../include'
   obj.target='xmmsipc'
   obj.uselib_local='xmmssocket'
-  obj.install = lambda: True
+  obj.install_in = 0
 
 def configure(conf):
   pass

src/lib/xmmssocket/wscript

@@ -12,7 +12,7 @@ def build(bld):
   obj.source = "socket_common.c socket_%s.c" % platform_src[os.name]
   obj.includes='. ../../include'
   obj.target='xmmssocket'
-  obj.install = lambda: True
+  obj.install_in = 0
 
 def configure(conf):
   pass

src/lib/xmmsutils/wscript

@@ -12,7 +12,7 @@ def build(bld):
   obj.source = "strlist.c utils_%s.c" % platform_src[os.name]
   obj.includes='. ../../include'
   obj.target='xmmsutils'
-  obj.install = lambda: True
+  obj.install_in = 0
 
 def configure(conf):
   pass

src/xmms/wscript

@@ -38,7 +38,7 @@ def build(bld):
     lib = bld.create_obj('cc', 'staticlib')
   lib.target = 'xmms2d'
   lib.includes = '. ../include ../includepriv'
-  lib.install = lambda: True
+  lib.install_in = 0
   lib.uselib = 'glib-2.0 gmodule-2.0 gthread-2.0 sqlite3'
   lib.source = source
 

waf

@@ -45,6 +45,35 @@ all_plugins = sets.Set([p for p in os.listdir("src/plugins")
 ####
 ## Build
 ####
+
+class pkgcobj(misc.cmdobj):
+  
+
+def _make_pkgconfig(bld):
+  val = {}
+  p = bld.env_of_name("default")["PREFIX"]
+  val["PREFIX"] = p
+  val["BINDIR"] = os.path.join(p, "bin")
+  val["LIBDIR"] = os.path.join(p, "lib")
+  val["INCLUDEDIR"] = os.path.join(p, "include")
+  val["VERSION"] = VERSION
+
+  for name, lib in [("xmms2-plugin", ""),
+                    ("xmms2-client", "-lxmmsclient"),
+                    ("xmms2-client-glib", "-lxmmsclient-glib"),
+                    ("xmms2-client-ecore", "-lxmmsclient-ecore"),
+                    ("xmms2-client-cpp", "-lxmmsclient -lxmmsclient++"),
+                    ("xmms2-client-cpp-glib", "-lxmmsclient++-glib -lxmmsclient++")]:
+    val["NAME"] = name
+    val["LIB"] = lib
+
+    obj = bld.create_obj("subst")
+    obj.source = 'xmms2.pc.in'
+    obj.target = name+".pc"
+    obj.dict = val
+    install
+
+
 def build(bld):
 #  bld.set_variants('default debug')
 
@@ -72,6 +101,9 @@ def build(bld):
   # Headers
   bld.add_subdirs('src/include')
 
+  # pkg-config
+  _make_pkgconfig(bld)
+
 ####
 ## Configuration
 ####

wscript

@@ -1,11 +1,11 @@
-prefix=%PREFIX%
-exec_prefix=%BINDIR%
-libdir=%LIBDIR%
-includedir=%INCLUDEDIR%
+prefix=@PREFIX@
+exec_prefix=@BINDIR@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
 
-Name: %NAME%
+Name: @NAME@
 Description: XMMS Generation 2
 Requires:
-Version: %VERSION%
-Libs: -L${libdir} %LIB%
+Version: @VERSION@
+Libs: -L${libdir} @LIB@
 Cflags: -I${includedir}