.

setup.py

@@ -17,7 +17,7 @@
 #
 # See COPYING file for full licensing terms.
 # See https://www.nexedi.com/licensing for rationale and options.
-from golang.pyx.build import setup, DSO, Extension as PyGoExt, build_ext as _build_ext
+from golang.pyx.build import setup, DSO as _DSO, Extension as _PyGoExt, build_ext as _build_ext
 from setuptools_dso import Extension
 from setuptools import Command, find_packages
 from setuptools.command.build_py import build_py as _build_py
@@ -29,16 +29,30 @@ import os
 import sys
 
 
+# XXX doc
+def _with_includes(what, *argv, **kw):
+    kw = kw.copy()
+    kw['include_dirs'] = [
+            '.',
+            './include',
+            './3rdparty/ccan',
+            './3rdparty/include',
+        ]
+    return what(*argv, **kw)
+
+def PyGoExt(*argv, **kw):
+    return _with_includes(_PyGoExt, *argv, **kw)
+
+def DSO(*argv, **kw):
+    return _with_includes(_DSO, *argv, **kw)
+
+
+
 #_bigfile = Extension('wendelin.bigfile._bigfile',
 _bigfile = PyGoExt('wendelin.bigfile._bigfile',
             sources = [
                 'bigfile/_bigfile.c',
             ],
-            include_dirs = [
-                './include',
-                './3rdparty/ccan',
-                './3rdparty/include'
-            ],
             define_macros       = [('_GNU_SOURCE',None)],
             language            = 'c',
             extra_compile_args  = [
@@ -235,11 +249,6 @@ setup(
                      'bigfile/virtmem.c',
                      'lib/bug.c',
                      'lib/utils.c'],
-                    include_dirs = [        # XXX dup
-                        './include',
-                        './3rdparty/ccan',
-                        './3rdparty/include'
-                    ],
                     define_macros       = [('_GNU_SOURCE',None), ('BUILDING_LIBVIRTMEM',None)],   # XXX dup
                     language = 'c',
                     extra_compile_args  = [ # XXX dup
@@ -265,11 +274,6 @@ setup(
                          'wcfs/internal/wcfs_watchlink.cpp',
                          'wcfs/internal/wcfs_misc.cpp',
                         ],
-                        include_dirs = [    # XXX -> common place
-                            './include',
-                            './3rdparty/ccan',
-                            './3rdparty/include'
-                        ],
                         extra_compile_args = [
                             '-std=gnu++11', # not c++11 since we use typeof
                         ],