From patchwork Tue Dec 4 22:11:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 23 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E74BF60B13 for ; Tue, 4 Dec 2018 23:10:52 +0100 (CET) Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 50644553 for ; Tue, 4 Dec 2018 23:10:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1543961452; bh=kvJlXRmY8v8mS0YDVtbi5VpKQgTATPdxMfZN3JyM3t4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Llg3xT7eVd7FRE1rRIr6aMT09iZFLHzhK/+aS0m2cF+KPdUbD6c76qDovmgQZJ/mL NMjCpr7FflYIl9myzo0ROAUnF7aaBwxkCsVcDPWGIdE3CdWnnazffazeH2CH+gopuj 5mCEoNarh6kZTUf+hQksg/MYn+ItPA8Jowjrx0Yg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 5 Dec 2018 00:11:21 +0200 Message-Id: <20181204221123.571-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204221123.571-1-laurent.pinchart@ideasonboard.com> References: <20181204221123.571-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] Overhaul the directory structure X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Dec 2018 22:10:53 -0000 In order to match the directory structure of traditional projects, rename the top-level lib/ directory to src/libcamera/. Other libraries developed as part of the project will later find a home in src/. Split the libcamera header files in three categories: public headers describing the public API in include/libcamera/, internal headers describing the internal API in src/libcamera/include/, and private headers local to one or a small number of compilation units along the corresponding .cpp files. As no internal header exists yet the src/libcamera/include/ directory is created empty as the build system would fail otherwise. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- meson.build | 4 ++-- src/libcamera/include/.keep_empty | 0 {lib => src/libcamera}/main.cpp | 0 {lib => src/libcamera}/meson.build | 7 ++++++- src/meson.build | 1 + test/meson.build | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 src/libcamera/include/.keep_empty rename {lib => src/libcamera}/main.cpp (100%) rename {lib => src/libcamera}/meson.build (50%) create mode 100644 src/meson.build diff --git a/meson.build b/meson.build index e0aeefa30330..e6ed03f951c7 100644 --- a/meson.build +++ b/meson.build @@ -21,11 +21,11 @@ cpp_arguments = common_arguments add_project_arguments(c_arguments, language: 'c') add_project_arguments(cpp_arguments, language: 'cpp') -inc = include_directories('include') +libcamera_includes = include_directories('include') subdir('Documentation') subdir('include') -subdir('lib') +subdir('src') subdir('test') subdir('utils') diff --git a/src/libcamera/include/.keep_empty b/src/libcamera/include/.keep_empty new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/lib/main.cpp b/src/libcamera/main.cpp similarity index 100% rename from lib/main.cpp rename to src/libcamera/main.cpp diff --git a/lib/meson.build b/src/libcamera/meson.build similarity index 50% rename from lib/meson.build rename to src/libcamera/meson.build index fcd738cc86d8..07d9cd448342 100644 --- a/lib/meson.build +++ b/src/libcamera/meson.build @@ -1,6 +1,11 @@ sources = ['main.cpp'] +includes = [ + libcamera_includes, + include_directories('include'), +] + libcamera = shared_library('camera', sources, install : true, - include_directories : inc) + include_directories : includes) diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 000000000000..4ce9668caa7b --- /dev/null +++ b/src/meson.build @@ -0,0 +1 @@ +subdir('libcamera') diff --git a/test/meson.build b/test/meson.build index afe9bd9a741c..924a26f1ca66 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,5 +1,5 @@ test_init = executable('test_init', 'init.cpp', link_with : libcamera, - include_directories : inc) + include_directories : libcamera_includes) test('Initialisation test', test_init)