From fcf7238d6103e43eeacb236c92292b29afdd0106 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <andrew.johnson@arjohnsonau.com>
Date: Sun, 12 May 2024 17:22:39 +0300
Subject: [PATCH] Tidying include structure

---
 .gitignore       |  2 +-
 R/flags.R        |  1 +
 src/Makevars     | 10 ++++++----
 src/init.cpp     |  2 +-
 src/quickjsr.cpp |  2 --
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 787b1c4..7ed21fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 inst/lib
 inst/VERSION
-inst/include/**.h
+inst/include/quickjs
 *.o
 *.so
 *.a
diff --git a/R/flags.R b/R/flags.R
index 9ea5bce..ec1ec66 100644
--- a/R/flags.R
+++ b/R/flags.R
@@ -30,6 +30,7 @@ cxxflags <- function(to_console = FALSE) {
   incdir <- system.file("include", package = "QuickJSR", mustWork = TRUE)
   pkg_cxxflags <- paste(
     paste0("-I", shQuote(incdir)),
+    paste0("-I", shQuote(file.path(incdir, "quickjs"))),
     "-D_GNU_SOURCE",
     paste0("-DCONFIG_VERSION=\"", quickjs_version(), "\""),
     "-DSTRICT_R_HEADERS",
diff --git a/src/Makevars b/src/Makevars
index db6471e..1ce33a9 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,4 +1,5 @@
-PKG_CPPFLAGS = -I"../inst/include/" -D_GNU_SOURCE -DCONFIG_BIGNUM
+PKG_CPPFLAGS = -I"../inst/include/" -I"../inst/include/quickjs"
+PKG_CPPFLAGS += -D_GNU_SOURCE -DCONFIG_BIGNUM
 PKG_CPPFLAGS += -DCONFIG_VERSION=\"$(shell cat quickjs/VERSION)\"
 PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a
 
@@ -41,8 +42,8 @@ all: package-quickjs $(SHLIB)
 $(SHLIB): build-static
 
 package-quickjs:
-	@mkdir -p ../inst/include
-	@cp $(QUICKJS_C_HEADERS:%=quickjs/%) ../inst/include
+	@mkdir -p ../inst/include/quickjs
+	@cp $(QUICKJS_C_HEADERS:%=quickjs/%) ../inst/include/quickjs
 	@cp quickjs/VERSION ../inst/
 
 build-static: $(QUICKJS_OBJECTS)
@@ -53,4 +54,5 @@ $(QUICKJS_OBJECTS): quickjs/%.o : quickjs/%.c
 	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DSTRICT_R_HEADERS -funsigned-char -fwrapv -std=c11 -c $< -o $@
 
 clean:
-	$(RM) $(QUICKJS_OBJECTS) ../inst/lib/$(R_ARCH)/libquickjs.a
+	$(RM) $(QUICKJS_OBJECTS) $(OBJECTS) ../inst/VERSION
+	$(RM) -r ../inst/lib ../inst/include/quickjs
diff --git a/src/init.cpp b/src/init.cpp
index 5d09208..427bf79 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1,4 +1,4 @@
-#include "cpp11.hpp"
+#include <cpp11.hpp>
 #include <R_ext/Visibility.h>
 
 #ifdef __cplusplus
diff --git a/src/quickjsr.cpp b/src/quickjsr.cpp
index 5a1df61..a698292 100644
--- a/src/quickjsr.cpp
+++ b/src/quickjsr.cpp
@@ -1,7 +1,5 @@
 #include <cpp11.hpp>
 #include <cpp11/declarations.hpp>
-#include <fstream>
-#include <sstream>
 #include <quickjs-libc.h>
 
 // Register the cpp11 external pointer types with the correct cleanup/finaliser functions