Move includes to a separate directory

This is more conventional and directories named "include" are specially
understood by some tooling like clang-tidy.

32 files changed, 26 insertions, 22 deletions

diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in
index 4e91ca2..b032abe 100644
--- a/doc/reference.doxygen.in
+++ b/doc/reference.doxygen.in
@@ -797,7 +797,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = @PUGL_SRCDIR@/pugl/ \
+INPUT                  = @PUGL_SRCDIR@/include/pugl/ \
                          @PUGL_SRCDIR@/doc/mainpage.md
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/pugl/detail/implementation.c b/include/pugl/detail/implementation.c
index 6a5f932..6a5f932 100644
--- a/pugl/detail/implementation.c
+++ b/include/pugl/detail/implementation.c
diff --git a/pugl/detail/implementation.h b/include/pugl/detail/implementation.h
index ff97fef..ff97fef 100644
--- a/pugl/detail/implementation.h
+++ b/include/pugl/detail/implementation.h
diff --git a/pugl/detail/mac.h b/include/pugl/detail/mac.h
index 7b64cfe..7b64cfe 100644
--- a/pugl/detail/mac.h
+++ b/include/pugl/detail/mac.h
diff --git a/pugl/detail/mac.m b/include/pugl/detail/mac.m
index 354546a..354546a 100644
--- a/pugl/detail/mac.m
+++ b/include/pugl/detail/mac.m
diff --git a/pugl/detail/mac_cairo.m b/include/pugl/detail/mac_cairo.m
index 18209d9..18209d9 100644
--- a/pugl/detail/mac_cairo.m
+++ b/include/pugl/detail/mac_cairo.m
diff --git a/pugl/detail/mac_gl.m b/include/pugl/detail/mac_gl.m
index 4d4f324..4d4f324 100644
--- a/pugl/detail/mac_gl.m
+++ b/include/pugl/detail/mac_gl.m
diff --git a/pugl/detail/mac_stub.m b/include/pugl/detail/mac_stub.m
index 8271735..8271735 100644
--- a/pugl/detail/mac_stub.m
+++ b/include/pugl/detail/mac_stub.m
diff --git a/pugl/detail/stub.h b/include/pugl/detail/stub.h
index acd3181..acd3181 100644
--- a/pugl/detail/stub.h
+++ b/include/pugl/detail/stub.h
diff --git a/pugl/detail/types.h b/include/pugl/detail/types.h
index edd2bd0..edd2bd0 100644
--- a/pugl/detail/types.h
+++ b/include/pugl/detail/types.h
diff --git a/pugl/detail/win.c b/include/pugl/detail/win.c
index 078b0a0..078b0a0 100644
--- a/pugl/detail/win.c
+++ b/include/pugl/detail/win.c
diff --git a/pugl/detail/win.h b/include/pugl/detail/win.h
index b0d92e0..b0d92e0 100644
--- a/pugl/detail/win.h
+++ b/include/pugl/detail/win.h
diff --git a/pugl/detail/win_cairo.c b/include/pugl/detail/win_cairo.c
index 1b9afb9..1b9afb9 100644
--- a/pugl/detail/win_cairo.c
+++ b/include/pugl/detail/win_cairo.c
diff --git a/pugl/detail/win_gl.c b/include/pugl/detail/win_gl.c
index 096c715..096c715 100644
--- a/pugl/detail/win_gl.c
+++ b/include/pugl/detail/win_gl.c
diff --git a/pugl/detail/win_stub.c b/include/pugl/detail/win_stub.c
index ab9e6aa..ab9e6aa 100644
--- a/pugl/detail/win_stub.c
+++ b/include/pugl/detail/win_stub.c
diff --git a/pugl/detail/x11.c b/include/pugl/detail/x11.c
index fd76606..fd76606 100644
--- a/pugl/detail/x11.c
+++ b/include/pugl/detail/x11.c
diff --git a/pugl/detail/x11.h b/include/pugl/detail/x11.h
index b5ca75c..b5ca75c 100644
--- a/pugl/detail/x11.h
+++ b/include/pugl/detail/x11.h
diff --git a/pugl/detail/x11_cairo.c b/include/pugl/detail/x11_cairo.c
index 0112c4e..0112c4e 100644
--- a/pugl/detail/x11_cairo.c
+++ b/include/pugl/detail/x11_cairo.c
diff --git a/pugl/detail/x11_gl.c b/include/pugl/detail/x11_gl.c
index b756355..b756355 100644
--- a/pugl/detail/x11_gl.c
+++ b/include/pugl/detail/x11_gl.c
diff --git a/pugl/detail/x11_stub.c b/include/pugl/detail/x11_stub.c
index 8efd68f..8efd68f 100644
--- a/pugl/detail/x11_stub.c
+++ b/include/pugl/detail/x11_stub.c
diff --git a/pugl/gl.h b/include/pugl/gl.h
index 9f7a741..9f7a741 100644
--- a/pugl/gl.h
+++ b/include/pugl/gl.h
diff --git a/pugl/glu.h b/include/pugl/glu.h
index 423a917..423a917 100644
--- a/pugl/glu.h
+++ b/include/pugl/glu.h
diff --git a/pugl/pugl.h b/include/pugl/pugl.h
index ad24c0d..ad24c0d 100644
--- a/pugl/pugl.h
+++ b/include/pugl/pugl.h
diff --git a/pugl/pugl.hpp b/include/pugl/pugl.hpp
index 9709e51..9709e51 100644
--- a/pugl/pugl.hpp
+++ b/include/pugl/pugl.hpp
diff --git a/pugl/pugl.ipp b/include/pugl/pugl.ipp
index 0ed8c4d..0ed8c4d 100644
--- a/pugl/pugl.ipp
+++ b/include/pugl/pugl.ipp
diff --git a/pugl/pugl_cairo.h b/include/pugl/pugl_cairo.h
index 4b3b621..4b3b621 100644
--- a/pugl/pugl_cairo.h
+++ b/include/pugl/pugl_cairo.h
diff --git a/pugl/pugl_cairo.hpp b/include/pugl/pugl_cairo.hpp
index 5b17ab7..5b17ab7 100644
--- a/pugl/pugl_cairo.hpp
+++ b/include/pugl/pugl_cairo.hpp
diff --git a/pugl/pugl_gl.h b/include/pugl/pugl_gl.h
index 471c5ac..471c5ac 100644
--- a/pugl/pugl_gl.h
+++ b/include/pugl/pugl_gl.h
diff --git a/pugl/pugl_gl.hpp b/include/pugl/pugl_gl.hpp
index 4bc5bbd..4bc5bbd 100644
--- a/pugl/pugl_gl.hpp
+++ b/include/pugl/pugl_gl.hpp
diff --git a/pugl/pugl_stub.h b/include/pugl/pugl_stub.h
index f50418e..f50418e 100644
--- a/pugl/pugl_stub.h
+++ b/include/pugl/pugl_stub.h
diff --git a/pugl/pugl_stub.hpp b/include/pugl/pugl_stub.hpp
index c5f3901..c5f3901 100644
--- a/pugl/pugl_stub.hpp
+++ b/include/pugl/pugl_stub.hpp
diff --git a/wscript b/wscript
index 12def7e..e3526bd 100644
--- a/wscript
+++ b/wscript
@@ -283,13 +283,15 @@ tests = gl_tests + basic_tests
 def build(bld):
     # C Headers
     includedir = '${INCLUDEDIR}/pugl-%s/pugl' % PUGL_MAJOR_VERSION
-    bld.install_files(includedir, bld.path.ant_glob('pugl/*.h'))
-    bld.install_files(includedir, bld.path.ant_glob('pugl/*.hpp'))
-    bld.install_files(includedir, bld.path.ant_glob('pugl/*.ipp'))
+    bld.install_files(includedir, bld.path.ant_glob('include/pugl/*.h'))
+    bld.install_files(includedir, bld.path.ant_glob('include/pugl/*.hpp'))
+    bld.install_files(includedir, bld.path.ant_glob('include/pugl/*.ipp'))
     if bld.env.ALL_HEADERS:
         detaildir = os.path.join(includedir, 'detail')
-        bld.install_files(detaildir, bld.path.ant_glob('pugl/detail/*.h'))
-        bld.install_files(detaildir, bld.path.ant_glob('pugl/detail/*.c'))
+        bld.install_files(detaildir,
+                          bld.path.ant_glob('include/pugl/detail/*.h'))
+        bld.install_files(detaildir,
+                          bld.path.ant_glob('include/pugl/detail/*.c'))
 
     # Library dependencies of pugl libraries (for building examples)
     deps = {}
@@ -300,8 +302,8 @@ def build(bld):
             deps[name][k] = kwargs.get(k, [])
 
         args = kwargs.copy()
-        args.update({'includes':        ['.'],
-                     'export_includes': ['.'],
+        args.update({'includes':        ['include'],
+                     'export_includes': ['include'],
                      'install_path':    '${LIBDIR}',
                      'vnum':            PUGL_VERSION})
 
@@ -343,68 +345,68 @@ def build(bld):
                        deps=kwargs,
                        requires=['pugl-%s' % PUGL_MAJOR_VERSION])
 
-    lib_source = ['pugl/detail/implementation.c']
+    lib_source = ['include/pugl/detail/implementation.c']
     if bld.env.TARGET_PLATFORM == 'win32':
         platform = 'win'
         build_platform('win',
                        uselib=['GDI32', 'USER32'],
-                       source=lib_source + ['pugl/detail/win.c'])
+                       source=lib_source + ['include/pugl/detail/win.c'])
 
         build_backend('win', 'stub',
                       uselib=['GDI32', 'USER32'],
-                      source=['pugl/detail/win_stub.c'])
+                      source=['include/pugl/detail/win_stub.c'])
 
         if bld.env.HAVE_GL:
             build_backend('win', 'gl',
                           uselib=['GDI32', 'USER32', 'GL'],
-                          source=['pugl/detail/win_gl.c'])
+                          source=['include/pugl/detail/win_gl.c'])
 
         if bld.env.HAVE_CAIRO:
             build_backend('win', 'cairo',
                           uselib=['CAIRO', 'GDI32', 'USER32'],
-                          source=['pugl/detail/win_cairo.c'])
+                          source=['include/pugl/detail/win_cairo.c'])
 
     elif bld.env.TARGET_PLATFORM == 'darwin':
         platform = 'mac'
         build_platform('mac',
                        framework=['Cocoa', 'Corevideo'],
-                       source=lib_source + ['pugl/detail/mac.m'])
+                       source=lib_source + ['include/pugl/detail/mac.m'])
 
         build_backend('mac', 'stub',
                       framework=['Cocoa', 'Corevideo'],
-                      source=['pugl/detail/mac_stub.m'])
+                      source=['include/pugl/detail/mac_stub.m'])
 
         if bld.env.HAVE_GL:
             build_backend('mac', 'gl',
                           framework=['Cocoa', 'Corevideo', 'OpenGL'],
-                          source=['pugl/detail/mac_gl.m'])
+                          source=['include/pugl/detail/mac_gl.m'])
 
         if bld.env.HAVE_CAIRO:
             build_backend('mac', 'cairo',
                           framework=['Cocoa', 'Corevideo'],
                           uselib=['CAIRO'],
-                          source=['pugl/detail/mac_cairo.m'])
+                          source=['include/pugl/detail/mac_cairo.m'])
     else:
         platform = 'x11'
         build_platform('x11',
                        uselib=['M', 'X11', 'XSYNC', 'XCURSOR', 'XRANDR'],
-                       source=lib_source + ['pugl/detail/x11.c'])
+                       source=lib_source + ['include/pugl/detail/x11.c'])
 
         build_backend('x11', 'stub',
                       uselib=['X11'],
-                      source=['pugl/detail/x11_stub.c'])
+                      source=['include/pugl/detail/x11_stub.c'])
 
         if bld.env.HAVE_GL:
             glx_lib = 'GLX' if bld.env.LIB_GLX else 'GL'
             build_backend('x11', 'gl',
                           uselib=[glx_lib, 'X11'],
-                          source=['pugl/detail/x11_gl.c'])
+                          source=['include/pugl/detail/x11_gl.c'])
 
         if bld.env.HAVE_CAIRO:
             build_backend('x11', 'cairo',
                           uselib=['CAIRO', 'X11'],
-                          source=['pugl/detail/x11_cairo.c',
-                                  'pugl/detail/x11_stub.c'])
+                          source=['include/pugl/detail/x11_cairo.c',
+                                  'include/pugl/detail/x11_stub.c'])
 
     def build_example(prog, source, platform, backend, **kwargs):
         lang = 'cxx' if source[0].endswith('.cpp') else 'c'
@@ -419,6 +421,7 @@ def build(bld):
             bld(features     = 'subst',
                 source       = 'resources/Info.plist.in',
                 target       = '{}.app/Contents/Info.plist'.format(prog),
+                includes     = ['.'],
                 install_path = '',
                 NAME         = prog)
 
@@ -431,6 +434,7 @@ def build(bld):
         bld(features     = '%s %sprogram' % (lang, lang),
             source       = source,
             target       = target,
+            includes     = ['.'],
             use          = use,
             install_path = '',
             **kwargs)