Final vers

diff --git a/folder1/meson.build b/folder1/meson.build
index fb58566523f9d8cd5f4519d1fe93944db30cfbcf..d6650d462c3b942f30fd7e3ee7fbdf5f8832bc44 100644 (file)
--- 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 24fd9776254d91ff34aa28d0324a777c1a548ed4..2d27b9790d8461846377adddeb296b0c1eaa251c 100644 (file)
--- a/folder2/folder2.c
+++ b/folder2/folder2.c
@@ -1,4 +1,4 @@
-#include "../folder1/folder1.h"\r
+#include "folder1.h"\r
 #include "folder2.h"\r
 \r
 \r

diff --git a/folder2/meson.build b/folder2/meson.build
index 0059eecdcbc82060e694577b4a3b2178aa95ecfa..08a2111967ad2f79618fe6f0c45314778064e6b7 100644 (file)
--- 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 b09c6ba22023e8cf051bc0d2bd592223733be536..15dfb2f1d2a56b847199e47695da9cf43c3b8264 100644 (file)
--- 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)