MonetDB: Oct2020 - export missing include files (and include les...

[Niels Nes]

Changeset: 45d8304b335f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45d8304b335f
Modified Files:
        monetdb5/mal/CMakeLists.txt
        monetdb5/mal/mal_import.c
        monetdb5/mal/mal_import.h
        monetdb5/mal/mal_parser.c
        monetdb5/mal/mal_prelude.h
        monetdb5/mal/mal_scenario.c
        sql/backends/monet5/CMakeLists.txt
Branch: Oct2020
Log Message:

export missing include files (and include less with in .h files)


diffs (115 lines):

diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -17,7 +17,9 @@ set(mal_public_headers
   ${CMAKE_CURRENT_SOURCE_DIR}/mal_linker.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mal_namespace.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mal_stack.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/mal_type.h)
+  ${CMAKE_CURRENT_SOURCE_DIR}/mal_type.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mal_prelude.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mel.h)
 
 add_library(mal OBJECT)
 
@@ -53,7 +55,6 @@ target_sources(mal
   mal_embedded.c mal_embedded.h
   mal_private.h mal_internal.h
   mal_prelude.c
-  mel.h
   PUBLIC
   ${mal_public_headers})
 
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -32,6 +32,8 @@
 #include "mal_parser.h"
 #include "mal_authorize.h"
 #include "mal_private.h"
+#include "mal_session.h"
+#include "mal_utils.h"
 
 void
 slash_2_dir_sep(str fname)
diff --git a/monetdb5/mal/mal_import.h b/monetdb5/mal/mal_import.h
--- a/monetdb5/mal/mal_import.h
+++ b/monetdb5/mal/mal_import.h
@@ -11,8 +11,6 @@
 
 #include "mal_exception.h"
 #include "mal_client.h"
-#include "mal_session.h"
-#include "mal_utils.h"
 #include "mal_prelude.h"
 
 mal_export str malIncludeString(Client c, const str name, const str mal, int 
listing, MALfcn address);
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -20,6 +20,7 @@
 #include "mal_utils.h"
 #include "mal_builder.h"
 #include "mal_type.h"
+#include "mal_session.h"
 #include "mal_private.h"
 
 #define FATALINPUT MAXERRORS+1
diff --git a/monetdb5/mal/mal_prelude.h b/monetdb5/mal/mal_prelude.h
--- a/monetdb5/mal/mal_prelude.h
+++ b/monetdb5/mal/mal_prelude.h
@@ -11,8 +11,6 @@
 
 #include "mal_exception.h"
 #include "mal_client.h"
-#include "mal_session.h"
-#include "mal_utils.h"
 
 #include "mel.h"
 
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -97,6 +97,7 @@
 #include "mal_exception.h"
 #include "mal_profiler.h"
 #include "mal_private.h"
+#include "mal_session.h"
 
 #ifdef HAVE_SYS_TIMES_H
 # include <sys/times.h>
diff --git a/sql/backends/monet5/CMakeLists.txt 
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -48,11 +48,6 @@ if(HAVE_HGE)
 endif()
 
 create_include_object(
-  MAL_LANGUAGE
-  name_module "sql"
-  modules_list ${include_mal_files})
-
-create_include_object(
   SQL_LANGUAGE
   name_module "sql"
   path "${CMAKE_SOURCE_DIR}/sql/scripts/"
@@ -119,7 +114,8 @@ set_target_properties(sql
   PROPERTIES
   OUTPUT_NAME monetdbsql
   VERSION ${MONETDB_VERSION}
-  SOVERSION ${MONETDB_VERSION_MAJOR})
+  SOVERSION ${MONETDB_VERSION_MAJOR}
+  PUBLIC_HEADER "${sql_public_headers}")
 
 target_compile_definitions(sql
   PRIVATE
@@ -129,6 +125,9 @@ target_compile_definitions(sql
 install(TARGETS
   sql
   EXPORT sqlTargets
+  PUBLIC_HEADER
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
+  COMPONENT sql
   RUNTIME
   DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list