From b27bd0555c7d8f535e612563283c3bf5004a2f6d Mon Sep 17 00:00:00 2001
From: Jim Easterbrook <jim@jim-easterbrook.me.uk>
Date: Sat, 21 Oct 2017 13:47:52 +0100
Subject: [PATCH] Move macros.i and doc files to gphoto2/common

---
 .gitignore                        | 2 +-
 setup.py                          | 9 +++++----
 src/{ => gphoto2/common}/macros.i | 0
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename src/{ => gphoto2/common}/macros.i (100%)

diff --git a/.gitignore b/.gitignore
index 0d62afe..9ed8671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@ dist
 doxy2swig
 libgphoto2-*
 MANIFEST
-src/doc-*
+src/gphoto2/common/doc-*
 src/info.txt
 src/swig-*
diff --git a/setup.py b/setup.py
index d45c22e..7135a0a 100644
--- a/setup.py
+++ b/setup.py
@@ -162,7 +162,8 @@ def run(self):
                 ('gp_port_info_',      '_GPPortInfo',          'PortInfo'),
                 ('gp_widget_',         '_CameraWidget',        'CameraWidget'),
                 )
-            with open(os.path.join('src', 'doc-' + gp_version + '.i'), 'w') as of:
+            with open(os.path.join('src', 'gphoto2', 'common',
+                                   'doc-' + gp_version + '.i'), 'w') as of:
                 for match in re.finditer('%feature\("docstring"\) (\w+) \"(.+?)\";',
                                          text, re.DOTALL):
                     symbol = match.group(1)
@@ -215,13 +216,13 @@ def run(self):
                 break
         for use_builtin in swig_bis:
             # make options list
-            swig_opts = ['-python', '-nodefaultctor', '-O', '-Isrc',
-                         '-Wextra', '-Werror']
+            swig_opts = ['-python', '-nodefaultctor', '-O', '-Wextra', '-Werror']
             if use_builtin:
                 swig_opts += ['-builtin', '-nofastunpack']
             # do each gphoto2 version
             for gp_version in gp_versions:
-                doc_file = os.path.join('src', 'doc-' + gp_version + '.i')
+                doc_file = os.path.join(
+                    'src', 'gphoto2', 'common', 'doc-' + gp_version + '.i')
                 # do Python 2 and 3
                 for py_version in 2, 3:
                     output_dir = os.path.join('src', 'swig')
diff --git a/src/macros.i b/src/gphoto2/common/macros.i
similarity index 100%
rename from src/macros.i
rename to src/gphoto2/common/macros.i