From 6ef6d14d183b206ff0d23c3bc947286183147928 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Thu, 16 Feb 2023 02:36:16 -0300 Subject: [PATCH] restructure the link between the compiler and the library --- src/lib/meson.build | 2 +- src/{obelisk.cpp => main.cpp} | 4 ++-- src/{obelisk.h => main.h} | 0 src/meson.build | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/{obelisk.cpp => main.cpp} (98%) rename src/{obelisk.h => main.h} (100%) diff --git a/src/lib/meson.build b/src/lib/meson.build index 3cec326..95e1948 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -22,7 +22,7 @@ lib = library('obelisk', install : true ) -libobelisk_dep = declare_dependency( +libobelisk = declare_dependency( include_directories : incdirs, link_with : lib, sources : obelisk_lib_sources diff --git a/src/obelisk.cpp b/src/main.cpp similarity index 98% rename from src/obelisk.cpp rename to src/main.cpp index 602b692..edd4cc0 100644 --- a/src/obelisk.cpp +++ b/src/main.cpp @@ -1,9 +1,9 @@ #include "knowledge_base.h" #include "lexer.h" -#include "lib/include/obelisk.h" -#include "lib/version.h" +#include "main.h" #include "obelisk.h" #include "parser.h" +#include "version.h" #include #include diff --git a/src/obelisk.h b/src/main.h similarity index 100% rename from src/obelisk.h rename to src/main.h diff --git a/src/meson.build b/src/meson.build index 5f5900c..e6090d7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,7 +1,7 @@ subdir('lib') obelisk_sources = files( - 'obelisk.cpp', + 'main.cpp', 'lexer.cpp', 'parser.cpp', 'knowledge_base.cpp' @@ -23,7 +23,7 @@ link_args = ' ' + r.stdout().replace('\n', ' ') executable('obelisk', obelisk_sources, - dependencies : [libobelisk_dep, sqlite3], + dependencies : [libobelisk, sqlite3], cpp_args : cpp_args.split(), link_args : link_args.split(), install : true