From 8bd70297efb98069029a90cd28f15fe92d23ae68 Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Mon, 16 Jul 2018 22:05:24 +0200 Subject: [PATCH] Final vers --- folder1/meson.build | 2 -- folder2/folder2.c | 2 +- folder2/meson.build | 6 ++---- folder2_test/meson.build | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/folder1/meson.build b/folder1/meson.build index fb58566..d6650d4 100644 --- a/folder1/meson.build +++ b/folder1/meson.build @@ -1,5 +1,3 @@ folder1_inc = include_directories('.') - folder1_lib = static_library('folder1', 'folder1.c', include_directories : folder1_inc) - folder1_dep = declare_dependency(link_with: folder1_lib, include_directories : folder1_inc) diff --git a/folder2/folder2.c b/folder2/folder2.c index 24fd977..2d27b97 100644 --- a/folder2/folder2.c +++ b/folder2/folder2.c @@ -1,4 +1,4 @@ -#include "../folder1/folder1.h" +#include "folder1.h" #include "folder2.h" diff --git a/folder2/meson.build b/folder2/meson.build index 0059eec..08a2111 100644 --- a/folder2/meson.build +++ b/folder2/meson.build @@ -1,5 +1,3 @@ folder2_inc = include_directories('.') - -folder2_lib = static_library('folder2', 'folder2.c', include_directories : folder2_inc) - -folder2_dep = declare_dependency(link_with: folder2_lib, include_directories : folder2_inc, dependencies : folder1_dep) +folder2_lib = static_library('folder2', 'folder2.c', include_directories : folder2_inc, dependencies : folder1_dep) +folder2_dep = declare_dependency(link_with: folder2_lib, include_directories : folder2_inc) diff --git a/folder2_test/meson.build b/folder2_test/meson.build index b09c6ba..15dfb2f 100644 --- a/folder2_test/meson.build +++ b/folder2_test/meson.build @@ -1,3 +1,2 @@ -folder2_tst = executable('test2', 'folder2_test.cpp', - dependencies : [gtest, folder2_dep]) +folder2_tst = executable('test2', 'folder2_test.cpp', dependencies : [gtest, folder2_dep]) test('test 2', folder2_tst) -- 2.43.0