From 651b5e592b8b548cd8f19d3a8bf2ed7b9acfd3e7 Mon Sep 17 00:00:00 2001 From: Francesco Date: Fri, 12 Sep 2025 03:19:51 +0200 Subject: [PATCH] refactor(build): remove myclib submodule --- .gitmodules | 9 +++------ include/meson.build | 3 --- include/myclib | 1 - meson.build | 37 ++++++++++++++++++------------------- 4 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 include/meson.build delete mode 160000 include/myclib diff --git a/.gitmodules b/.gitmodules index 9182767..79385e2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "doxygen-awesome-css"] - path = doxygen-awesome-css - url = https://github.com/jothepro/doxygen-awesome-css.git -[submodule "include/myclib"] - path = include/myclib - url = https://github.com/FrancescoRocca/myclib +[submodule "doxygen-awesome-css"] + path = doxygen-awesome-css + url = https://github.com/jothepro/doxygen-awesome-css.git diff --git a/include/meson.build b/include/meson.build deleted file mode 100644 index 215ba66..0000000 --- a/include/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -myclib = files('myclib/hashmap/myhashmap.c') -myclib += files('myclib/string/mystring.c') -myclib += files('myclib/queue/myqueue.c') diff --git a/include/myclib b/include/myclib deleted file mode 160000 index 3bfd7fa..0000000 --- a/include/myclib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3bfd7faa24fd5414180b23046f52a6494e4adfb1 diff --git a/meson.build b/meson.build index c9288c6..837e840 100644 --- a/meson.build +++ b/meson.build @@ -1,19 +1,18 @@ -project('cws', 'c', version : '0.1.0') - -cc = meson.get_compiler('c') - -subdir('src') -subdir('include') - -incdir = include_directories('include') - -libssl = dependency('libssl') -libyaml = dependency('yaml-0.1') -libcyaml = dependency('libcyaml') -libmath = cc.find_library('m', required : true) -deps = [libssl, libyaml, libcyaml, libmath] - -add_global_arguments('-DUSE_COLORS', language : 'c') -add_global_arguments('-DEVELOPER', language : 'c') - -executable('cws', server + myclib, include_directories : incdir, dependencies : deps) +project('cws', 'c', version : '0.1.0') + +cc = meson.get_compiler('c') + +subdir('src') + +incdir = include_directories('include') + +libssl = dependency('libssl') +libyaml = dependency('yaml-0.1') +libcyaml = dependency('libcyaml') +libmath = cc.find_library('m', required : true) +deps = [libssl, libyaml, libcyaml, libmath] + +add_global_arguments('-DUSE_COLORS', language : 'c') +add_global_arguments('-DEVELOPER', language : 'c') + +executable('cws', server + myclib, include_directories : incdir, dependencies : deps)