move c_api to src; one single lib

HugoMVale · Jan 22, 2025 · 0fd91ba · 0fd91ba
1 parent ee51dca
commit 0fd91ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/c/meson.build b/c/meson.build
@@ -1,17 +1,3 @@
-odrpack_c_lib = library(
-  meson.project_name() + '_c',
-  sources: 'odrpack_capi.f90',
-  link_with: odrpack_lib,
-  install: true,
-)
-
-incdir = include_directories('include')
-
-odrpack_c_dep = declare_dependency(
-  include_directories: [incdir],
-  link_with: [odrpack_c_lib]
-)
-
 if get_option('build_examples')
   subdir('example')
 endif

diff --git a/meson.build b/meson.build
@@ -5,7 +5,6 @@ project(
   meson_version: '>=1.1',
   license: 'MIT',
   default_options: [
-  'default_library=static',
   'buildtype=release',
   'fortran_std=none'
   ],
@@ -41,22 +40,30 @@ odrpack_source = files(
   'src/odrpack_kinds.F90',
   'src/odrpack_core.f90',
   'src/odrpack_reports.f90',
+  'src/odrpack_capi.f90'
 )
 
-odrpack_lib = library(
+odrpack_lib = static_library(
   meson.project_name(),
   sources: [odrpack_source, blas_source],
   dependencies: [blas_dep],
-  install: true
+  # install: true
 )
 
-# C interface
-subdir('c')
+incdir = include_directories('c/include')
+
+odrpack_dep = declare_dependency(
+  include_directories: [incdir],
+  link_with: [odrpack_lib]
+)
 
 # Examples
 if get_option('build_examples')
     subdir('example')
 endif
 
+# C examples
+subdir('c')
+
 # Tests
 subdir('test')
diff --git a/c/odrpack_capi.f90 → src/odrpack_capi.f90 b/c/odrpack_capi.f90 → src/odrpack_capi.f90