C API: Keep the structure flat

See https://github.com/NixOS/nix/pull/10329
2025-07-07 01:51:47 +02:00 · 2024-03-28 19:00:04 +01:00 · 2024-03-28 19:00:04 +01:00 · c57de60522
commit c57de60522
parent d96b52bd8b
26 changed files with 50 additions and 32 deletions
--- a/src/libexpr-c/local.mk
+++ b/src/libexpr-c/local.mk
@ -0,0 +1,25 @@
+libraries += libexprc
+
+libexprc_NAME = libnixexprc
+
+libexprc_DIR := $(d)
+
+libexprc_SOURCES := \
+  $(wildcard $(d)/*.cc) \
+
+# Not just for this library itself, but also for downstream libraries using this library
+
+INCLUDE_libexprc := -I $(d)
+libexprc_CXXFLAGS += $(INCLUDE_libutil) $(INCLUDE_libutilc) \
+                     $(INCLUDE_libfetchers) \
+                     $(INCLUDE_libstore) $(INCLUDE_libstorec) \
+                     $(INCLUDE_libexpr) $(INCLUDE_libexprc)
+
+libexprc_LIBS = libutil libutilc libstore libstorec libexpr
+
+libexprc_LDFLAGS += -pthread
+
+$(eval $(call install-file-in, $(d)/nix-expr-c.pc, $(libdir)/pkgconfig, 0644))
+
+libexprc_FORCE_INSTALL := 1
+
--- a/src/libexpr-c/nix-expr-c.pc.in
+++ b/src/libexpr-c/nix-expr-c.pc.in
--- a/src/libexpr-c/nix_api_expr.cc
+++ b/src/libexpr-c/nix_api_expr.cc
--- a/src/libexpr-c/nix_api_expr.h
+++ b/src/libexpr-c/nix_api_expr.h
--- a/src/libexpr-c/nix_api_expr_internal.h
+++ b/src/libexpr-c/nix_api_expr_internal.h
--- a/src/libexpr-c/nix_api_external.cc
+++ b/src/libexpr-c/nix_api_external.cc
--- a/src/libexpr-c/nix_api_external.h
+++ b/src/libexpr-c/nix_api_external.h
--- a/src/libexpr-c/nix_api_value.cc
+++ b/src/libexpr-c/nix_api_value.cc
--- a/src/libexpr-c/nix_api_value.h
+++ b/src/libexpr-c/nix_api_value.h
--- a/src/libexpr/c/local.mk
+++ b/src/libexpr/c/local.mk
@ -1,19 +0,0 @@
-libraries += libexprc
-
-libexprc_NAME = libnixexprc
-
-libexprc_DIR := $(d)
-
-libexprc_SOURCES := \
-  $(wildcard $(d)/*.cc) \
-
-libexprc_CXXFLAGS += -I src/libutil -Isrc/libfetchers -I src/libstore -I src/libstorec -I src/libexpr -I src/libutil/c -I src/libstore/c
-
-libexprc_LIBS = libutil libutilc libstore libstorec libexpr
-
-libexprc_LDFLAGS += -pthread
-
-$(eval $(call install-file-in, $(d)/nix-expr-c.pc, $(libdir)/pkgconfig, 0644))
-
-libexprc_FORCE_INSTALL := 1
-
--- a/src/libstore-c/local.mk
+++ b/src/libstore-c/local.mk
@ -10,7 +10,11 @@ libstorec_LIBS = libutil libstore libutilc

 libstorec_LDFLAGS += -pthread

-libstorec_CXXFLAGS += -I src/libutil -I src/libstore -I src/libutil/c
+# Not just for this library itself, but also for downstream libraries using this library
+
+INCLUDE_libstorec := -I $(d)
+libstorec_CXXFLAGS += $(INCLUDE_libutil) $(INCLUDE_libutilc) \
+		    $(INCLUDE_libstore) $(INCLUDE_libstorec)

 $(eval $(call install-file-in, $(d)/nix-store-c.pc, $(libdir)/pkgconfig, 0644))

--- a/src/libstore-c/nix-store-c.pc.in
+++ b/src/libstore-c/nix-store-c.pc.in
--- a/src/libstore-c/nix_api_store.cc
+++ b/src/libstore-c/nix_api_store.cc
--- a/src/libstore-c/nix_api_store.h
+++ b/src/libstore-c/nix_api_store.h
--- a/src/libstore-c/nix_api_store_internal.h
+++ b/src/libstore-c/nix_api_store_internal.h
--- a/src/libutil-c/local.mk
+++ b/src/libutil-c/local.mk
@ -6,7 +6,10 @@ libutilc_DIR := $(d)

 libutilc_SOURCES := $(wildcard $(d)/*.cc)

-libutilc_CXXFLAGS += -I src/libutil
+# Not just for this library itself, but also for downstream libraries using this library
+
+INCLUDE_libutilc := -I $(d)
+libutilc_CXXFLAGS += $(INCLUDE_libutil) $(INCLUDE_libutilc)

 libutilc_LIBS = libutil

--- a/src/libutil-c/nix_api_util.cc
+++ b/src/libutil-c/nix_api_util.cc
--- a/src/libutil-c/nix_api_util.h
+++ b/src/libutil-c/nix_api_util.h
--- a/src/libutil-c/nix_api_util_internal.h
+++ b/src/libutil-c/nix_api_util_internal.h