Merge pull request #105 from cvvergara/org-code-option2

Org code option2
MobilityDB · Jul 27, 2021 · a61c886 · a61c886
2 parents 057329d + fa97b72
commit a61c886
Show file tree

Hide file tree

Showing 162 changed files with 1,395 additions and 1,387 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,66 +6,49 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} )
         You may need to remove 'CMakeCache.txt' and 'CMakeFiles/'.")
 endif()
 
-project(MobilityDB VERSION 1.0)
-set(MOBILITYDB_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+project(MobilityDB VERSION 1.0.0)
+set(MOBILITYDB_VERSION "${MobilityDB_VERSION}")
+set(MOBILITYDB_LIB_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+set(MOBILITYDB_LIB_NAME "${CMAKE_PROJECT_NAME}-${MOBILITYDB_LIB_VERSION}")
+set(PROJECT_VERSION_DEV "Beta 3")
+set(MOBILITYDB_VERSION_STR "${PROJECT_NAME} ${MOBILITYDB_VERSION} ${PROJECT_VERSION_DEV}")
 string(TOLOWER ${CMAKE_PROJECT_NAME} MOBILITYDB_LOWERCASE_NAME)
+set(MOBILITYDB_EXTENSION_FILE "${MOBILITYDB_LOWERCASE_NAME}--${MOBILITYDB_VERSION}.sql")
+
+add_definitions(-DMOBILITYDB_VERSION_STR="${MOBILITYDB_VERSION_STR}")
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(CheckSymbolExists)
 
-set(SRCS
-src/geo_constructors.c
-src/doublen.c
-src/lifting.c
-src/period.c
-src/periodset.c
-src/rangetypes_ext.c
-src/skiplist.c
-src/tbool_boolops.c
-src/tbox.c
-src/tempcache.c
-src/temporal.c
-src/tinstant.c
-src/tinstantset.c
-src/tsequence.c
-src/tsequenceset.c
-src/temporal_aggfuncs.c
-src/temporal_analyze.c
-src/temporal_boxops.c
-src/temporal_compops.c
-src/temporal_gist.c
-src/tnumber_mathfuncs.c
-src/temporal_parser.c
-src/temporal_posops.c
-src/temporal_selfuncs.c
-src/temporal_spgist.c
-src/temporal_tile.c
-src/temporal_util.c
-src/temporal_waggfuncs.c
-src/timeops.c
-src/timestampset.c
-src/time_aggfuncs.c
-src/time_analyze.c
-src/time_gist.c
-src/time_selfuncs.c
-src/time_spgist.c
-src/tnumber_distance.c
-src/tnumber_gist.c
-src/tnumber_selfuncs.c
-src/tnumber_spgist.c
-src/ttext_textfuncs.c
-)
 include(CTest)
 enable_testing()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
+#-------------------------------------
+# special cases of compiler flags
+#-------------------------------------
+
+include(CheckCCompilerFlag)
+if(NOT WIN32)
+  CHECK_C_COMPILER_FLAG("-fPIC" C_COMPILER_SUPPORTS_FPIC)
+  if(C_COMPILER_SUPPORTS_FPIC)
+    add_definitions(-fPIC)
+  endif()
+endif()
+
+check_symbol_exists(ffsl "string.h" HAS_FFSL)
+if(NOT HAS_FFSL)
+	add_definitions(-DNO_FFSL)
+endif()
+
 #-------------------------------------
 # Verify PostgreSQL Version
 #-------------------------------------
 set(PG_MIN_MAJOR_VERSION "10")
 set(PG_MAX_MAJOR_VERSION "14")
 
+#--------------------------------
 find_package(POSTGRESQL ${PG_MIN_MAJOR_VERSION} REQUIRED)
 if (NOT POSTGRES_VERSION VERSION_LESS PG_MAX_MAJOR_VERSION)
   message(FATAL_ERROR "Not supporting PostgreSQL ${POSTGRESQL_VERSION}")
@@ -85,12 +68,15 @@ if(WIN32)
     link_directories(${POSTGRESQL_LIBRARIES})
     link_libraries(postgres)
 endif()
-#--------------------------------
 
+# Currently does not work with other versions of PostGIS
+find_package(POSTGIS 2.5 EXACT REQUIRED)
+add_definitions(-DPOSTGIS_VERSION_STR="${POSTGIS_VERSION_STR}")
+add_definitions(-DPOSTGIS_VERSION_NUMBER=${POSTGIS_VERSION_NUMBER})
 
-include_directories("include")
 #--------------------------------
 
+
 add_definitions(-Wall -Wextra -std=gnu1x -Wno-unused-parameter)
 if (CMAKE_COMPILER_IS_GNUCC)
 	if (WITH_COVERAGE)
@@ -102,60 +88,51 @@ endif ()
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
 
 
-set(CONTROLIN "control.in")
-set(CONTROLOUT "${MOBILITYDB_LOWERCASE_NAME}.control")
-set(SQLPP "${MOBILITYDB_LOWERCASE_NAME}--${MOBILITYDB_VERSION}.sql.c")
-set(MOBILITYDB_EXTENSION_FILE "${MOBILITYDB_LOWERCASE_NAME}--${MOBILITYDB_VERSION}.sql")
-
-
-add_custom_target(sqlscript ALL DEPENDS ${CMAKE_BINARY_DIR}/${MOBILITYDB_EXTENSION_FILE})
-add_custom_target(control ALL DEPENDS ${CMAKE_BINARY_DIR}/${CONTROLOUT})
-
-add_library(${CMAKE_PROJECT_NAME} MODULE ${SRCS})
-
 if (APPLE)
 	SET_TARGET_PROPERTIES(${CMAKE_PROJECT_NAME} PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -bundle_loader /usr/local/bin/postgres")
 endif ()
 
-# Currently does not work with other versions of PostGIS
-find_package(POSTGIS 2.5 EXACT REQUIRED)
-add_definitions(-DPOSTGIS_VERSION_STR="${POSTGIS_VERSION_STR}")
-add_definitions(-DPOSTGIS_VERSION_NUMBER=${POSTGIS_VERSION_NUMBER})
+#--------------------------------
+# Belongs to MobilityDB
+# Must go before target_link_libraries
+
+include_directories("include")
+add_subdirectory("src")
+set(PROJECT_OBJECTS "$<TARGET_OBJECTS:general>")
+set(PROJECT_OBJECTS ${PROJECT_OBJECTS} "$<TARGET_OBJECTS:point>")
+set(PROJECT_OBJECTS ${PROJECT_OBJECTS} "$<TARGET_OBJECTS:npoint>")
+add_library(${MOBILITYDB_LIB_NAME} MODULE ${PROJECT_OBJECTS})
+
+#--------------------------------
+# other requirements
+#--------------------------------
 
 find_package(JSON-C REQUIRED)
 include_directories(${JSON-C_INCLUDE_DIRS})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${JSON-C_LIBRARIES})
+target_link_libraries(${MOBILITYDB_LIB_NAME} ${JSON-C_LIBRARIES})
 
 find_package(PROJ REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} ${PROJ_LIBRARIES})
+target_link_libraries(${MOBILITYDB_LIB_NAME} ${PROJ_LIBRARIES})
 include_directories(${PROJ_INCLUDE_DIRS})
 
 find_package(LWGEOM REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} ${LWGEOM_LIBRARIES})
+target_link_libraries(${MOBILITYDB_LIB_NAME} ${LWGEOM_LIBRARIES})
 include_directories(${LWGEOM_INCLUDE_DIRS})
 
 find_package(GSL REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} ${GSL_LIBRARY})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${GSL_CLBAS_LIBRARY})
+target_link_libraries(${MOBILITYDB_LIB_NAME} ${GSL_LIBRARY})
+target_link_libraries(${MOBILITYDB_LIB_NAME} ${GSL_CLBAS_LIBRARY})
 
+#--------------------------------
+# Belongs to MobilityDB
 
 add_subdirectory(test)
-include("point/point.cmake")
-include("npoint/npoint.cmake")
-
+add_subdirectory(sql)
 
-check_symbol_exists(ffsl "string.h" HAS_FFSL)
-if(NOT HAS_FFSL)
-	add_definitions(-D NO_FFSL)
-endif()
+add_custom_target(sqlscript ALL DEPENDS ${CMAKE_BINARY_DIR}/${MOBILITYDB_EXTENSION_FILE})
+add_custom_target(control ALL DEPENDS ${CMAKE_BINARY_DIR}/mobilitydb.control)
 
-add_subdirectory(sql)
-add_custom_command(
-	OUTPUT ${CONTROLOUT}
-	COMMAND cat ${CONTROLIN} | sed -e's/LIBNAME/${CMAKE_PROJECT_NAME}/' -e's/VERSION/${MOBILITYDB_VERSION}/'  > ${CMAKE_BINARY_DIR}/${CONTROLOUT}
-	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-	DEPENDS ${CONTROLIN})
-
-install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION "${POSTGRESQL_DYNLIB_DIR}")
-install(FILES "${CMAKE_BINARY_DIR}/${CONTROLOUT}" DESTINATION "${POSTGRESQL_SHARE_DIR}/extension")
-install(FILES "${CMAKE_BINARY_DIR}/${MOBILITYDB_EXTENSION_FILE}" DESTINATION "${POSTGRESQL_SHARE_DIR}/extension")
+install(TARGETS ${MOBILITYDB_LIB_NAME} DESTINATION "${POSTGRESQL_DYNLIB_DIR}")
+install(
+  FILES "${CMAKE_BINARY_DIR}/mobilitydb.control"  "${CMAKE_BINARY_DIR}/${MOBILITYDB_EXTENSION_FILE}"
+  DESTINATION "${POSTGRESQL_SHARE_DIR}/extension")
diff --git a/include/doublen.h → include/general/doublen.h b/include/doublen.h → include/general/doublen.h
diff --git a/include/lifting.h → include/general/lifting.h b/include/lifting.h → include/general/lifting.h
diff --git a/include/period.h → include/general/period.h b/include/period.h → include/general/period.h
diff --git a/include/periodset.h → include/general/periodset.h b/include/periodset.h → include/general/periodset.h
diff --git a/include/rangetypes_ext.h → include/general/rangetypes_ext.h b/include/rangetypes_ext.h → include/general/rangetypes_ext.h
diff --git a/include/skiplist.h → include/general/skiplist.h b/include/skiplist.h → include/general/skiplist.h
diff --git a/include/tbool_boolops.h → include/general/tbool_boolops.h b/include/tbool_boolops.h → include/general/tbool_boolops.h
diff --git a/include/tbox.h → include/general/tbox.h b/include/tbox.h → include/general/tbox.h
diff --git a/include/tempcache.h → include/general/tempcache.h b/include/tempcache.h → include/general/tempcache.h
diff --git a/include/temporal.h → include/general/temporal.h b/include/temporal.h → include/general/temporal.h
@@ -40,7 +40,7 @@
 
 #include "timetypes.h"
 #include "tbox.h"
-#include "stbox.h"
+#include "point/stbox.h"
 
 #if POSTGRESQL_VERSION_NUMBER < 130000
 #ifndef USE_FLOAT4_BYVAL
@@ -143,7 +143,6 @@ typedef enum
  * Compatibility with older versions of PostgreSQL
  *****************************************************************************/
 
-#define MOBDB_VERSION_STR "MobilityDB 1.0 beta 3"
 
 
 /*****************************************************************************

diff --git a/include/temporal_aggfuncs.h → include/general/temporal_aggfuncs.h b/include/temporal_aggfuncs.h → include/general/temporal_aggfuncs.h
diff --git a/include/temporal_analyze.h → include/general/temporal_analyze.h b/include/temporal_analyze.h → include/general/temporal_analyze.h
diff --git a/include/temporal_boxops.h → include/general/temporal_boxops.h b/include/temporal_boxops.h → include/general/temporal_boxops.h
diff --git a/include/temporal_compops.h → include/general/temporal_compops.h b/include/temporal_compops.h → include/general/temporal_compops.h
diff --git a/include/temporal_gist.h → include/general/temporal_gist.h b/include/temporal_gist.h → include/general/temporal_gist.h
diff --git a/include/temporal_parser.h → include/general/temporal_parser.h b/include/temporal_parser.h → include/general/temporal_parser.h
diff --git a/include/temporal_posops.h → include/general/temporal_posops.h b/include/temporal_posops.h → include/general/temporal_posops.h
diff --git a/include/temporal_selfuncs.h → include/general/temporal_selfuncs.h b/include/temporal_selfuncs.h → include/general/temporal_selfuncs.h
diff --git a/include/temporal_spgist.h → include/general/temporal_spgist.h b/include/temporal_spgist.h → include/general/temporal_spgist.h
diff --git a/include/temporal_tile.h → include/general/temporal_tile.h b/include/temporal_tile.h → include/general/temporal_tile.h
diff --git a/include/temporal_util.h → include/general/temporal_util.h b/include/temporal_util.h → include/general/temporal_util.h
@@ -41,7 +41,7 @@
 #include <utils/rangetypes.h>
 
 #include "temporal.h"
-#include "postgis.h"
+#include "point/postgis.h"
 
 /*****************************************************************************/
 

diff --git a/include/temporal_waggfuncs.h → include/general/temporal_waggfuncs.h b/include/temporal_waggfuncs.h → include/general/temporal_waggfuncs.h
diff --git a/include/temporaltypes.h → include/general/temporaltypes.h b/include/temporaltypes.h → include/general/temporaltypes.h
diff --git a/include/time_aggfuncs.h → include/general/time_aggfuncs.h b/include/time_aggfuncs.h → include/general/time_aggfuncs.h
diff --git a/include/time_analyze.h → include/general/time_analyze.h b/include/time_analyze.h → include/general/time_analyze.h
diff --git a/include/time_gist.h → include/general/time_gist.h b/include/time_gist.h → include/general/time_gist.h
diff --git a/include/time_selfuncs.h → include/general/time_selfuncs.h b/include/time_selfuncs.h → include/general/time_selfuncs.h
diff --git a/include/time_spgist.h → include/general/time_spgist.h b/include/time_spgist.h → include/general/time_spgist.h
diff --git a/include/timeops.h → include/general/timeops.h b/include/timeops.h → include/general/timeops.h
diff --git a/include/timestampset.h → include/general/timestampset.h b/include/timestampset.h → include/general/timestampset.h
diff --git a/include/timetypes.h → include/general/timetypes.h b/include/timetypes.h → include/general/timetypes.h
diff --git a/include/tinstant.h → include/general/tinstant.h b/include/tinstant.h → include/general/tinstant.h
@@ -38,7 +38,7 @@
 #include <utils/rangetypes.h>
 
 #include "temporal.h"
-#include "postgis.h"
+#include "point/postgis.h"
 
 /*****************************************************************************/
 

diff --git a/include/tinstantset.h → include/general/tinstantset.h b/include/tinstantset.h → include/general/tinstantset.h
diff --git a/include/tnumber_distance.h → include/general/tnumber_distance.h b/include/tnumber_distance.h → include/general/tnumber_distance.h
diff --git a/include/tnumber_gist.h → include/general/tnumber_gist.h b/include/tnumber_gist.h → include/general/tnumber_gist.h
diff --git a/include/tnumber_mathfuncs.h → include/general/tnumber_mathfuncs.h b/include/tnumber_mathfuncs.h → include/general/tnumber_mathfuncs.h
diff --git a/include/tnumber_selfuncs.h → include/general/tnumber_selfuncs.h b/include/tnumber_selfuncs.h → include/general/tnumber_selfuncs.h
diff --git a/include/tnumber_spgist.h → include/general/tnumber_spgist.h b/include/tnumber_spgist.h → include/general/tnumber_spgist.h
diff --git a/include/tsequence.h → include/general/tsequence.h b/include/tsequence.h → include/general/tsequence.h
diff --git a/include/tsequenceset.h → include/general/tsequenceset.h b/include/tsequenceset.h → include/general/tsequenceset.h
diff --git a/include/ttext_textfuncs.h → include/general/ttext_textfuncs.h b/include/ttext_textfuncs.h → include/general/ttext_textfuncs.h
diff --git a/npoint/include/tnpoint.h → include/npoint/tnpoint.h b/npoint/include/tnpoint.h → include/npoint/tnpoint.h
@@ -34,7 +34,7 @@
 
 #include <postgres.h>
 #include <catalog/pg_type.h>
-#include "temporal.h"
+#include "general/temporal.h"
 
 /*****************************************************************************
  * Struct definitions

diff --git a/npoint/include/tnpoint_aggfuncs.h → include/npoint/tnpoint_aggfuncs.h b/npoint/include/tnpoint_aggfuncs.h → include/npoint/tnpoint_aggfuncs.h
diff --git a/npoint/include/tnpoint_analyze.h → include/npoint/tnpoint_analyze.h b/npoint/include/tnpoint_analyze.h → include/npoint/tnpoint_analyze.h
diff --git a/npoint/include/tnpoint_boxops.h → include/npoint/tnpoint_boxops.h b/npoint/include/tnpoint_boxops.h → include/npoint/tnpoint_boxops.h
@@ -35,7 +35,7 @@
 #include <postgres.h>
 #include <catalog/pg_type.h>
 
-#include "temporal.h"
+#include "general/temporal.h"
 #include "tnpoint.h"
 
 /*****************************************************************************/

diff --git a/npoint/include/tnpoint_distance.h → include/npoint/tnpoint_distance.h b/npoint/include/tnpoint_distance.h → include/npoint/tnpoint_distance.h
@@ -34,7 +34,7 @@
 
 #include <postgres.h>
 #include <catalog/pg_type.h>
-#include "temporal.h"
+#include "general/temporal.h"
 
 /*****************************************************************************/
 

diff --git a/npoint/include/tnpoint_indexes.h → include/npoint/tnpoint_indexes.h b/npoint/include/tnpoint_indexes.h → include/npoint/tnpoint_indexes.h
diff --git a/npoint/include/tnpoint_parser.h → include/npoint/tnpoint_parser.h b/npoint/include/tnpoint_parser.h → include/npoint/tnpoint_parser.h
@@ -32,7 +32,7 @@
 #ifndef __TNPOINT_PARSER_H__
 #define __TNPOINT_PARSER_H__
 
-#include "temporal.h"
+#include "general/temporal.h"
 #include "tnpoint.h"
 
 /*****************************************************************************/

diff --git a/npoint/include/tnpoint_posops.h → include/npoint/tnpoint_posops.h b/npoint/include/tnpoint_posops.h → include/npoint/tnpoint_posops.h
diff --git a/npoint/include/tnpoint_selfuncs.h → include/npoint/tnpoint_selfuncs.h b/npoint/include/tnpoint_selfuncs.h → include/npoint/tnpoint_selfuncs.h
diff --git a/npoint/include/tnpoint_spatialfuncs.h → include/npoint/tnpoint_spatialfuncs.h b/npoint/include/tnpoint_spatialfuncs.h → include/npoint/tnpoint_spatialfuncs.h
@@ -35,7 +35,7 @@
 #include <postgres.h>
 #include <catalog/pg_type.h>
 
-#include "temporal.h"
+#include "general/temporal.h"
 #include "tnpoint_static.h"
 
 /*****************************************************************************/

diff --git a/npoint/include/tnpoint_spatialrels.h → include/npoint/tnpoint_spatialrels.h b/npoint/include/tnpoint_spatialrels.h → include/npoint/tnpoint_spatialrels.h
diff --git a/npoint/include/tnpoint_static.h → include/npoint/tnpoint_static.h b/npoint/include/tnpoint_static.h → include/npoint/tnpoint_static.h
diff --git a/npoint/include/tnpoint_tempspatialrels.h → include/npoint/tnpoint_tempspatialrels.h b/npoint/include/tnpoint_tempspatialrels.h → include/npoint/tnpoint_tempspatialrels.h
diff --git a/point/include/geography_funcs.h → include/point/geography_funcs.h b/point/include/geography_funcs.h → include/point/geography_funcs.h
diff --git a/point/include/postgis.h → include/point/postgis.h b/point/include/postgis.h → include/point/postgis.h
@@ -310,7 +310,7 @@ extern Datum geography_lt(PG_FUNCTION_ARGS);
 #define PG_GETARG_GSERIALIZED_P(varno) ((GSERIALIZED *)PG_DETOAST_DATUM(PG_GETARG_DATUM(varno)))
 #define PG_GETARG_GSERIALIZED_P_COPY(varno) ((GSERIALIZED *)PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(varno)))
 
-#include "temporal.h"
+#include "general/temporal.h"
 #include <liblwgeom.h>
 
 #endif /* __TEMPORAL_POSTGIS_H__ */

diff --git a/point/include/projection_gk.h → include/point/projection_gk.h b/point/include/projection_gk.h → include/point/projection_gk.h
diff --git a/point/include/stbox.h → include/point/stbox.h b/point/include/stbox.h → include/point/stbox.h
@@ -41,7 +41,7 @@
 #endif
 #include <liblwgeom.h>
 
-#include "timetypes.h"
+#include "general/timetypes.h"
 
 /*****************************************************************************
  * Struct definition

diff --git a/point/include/tpoint.h → include/point/tpoint.h b/point/include/tpoint.h → include/point/tpoint.h
@@ -37,7 +37,7 @@
 #include <postgres.h>
 #include <catalog/pg_type.h>
 
-#include "temporal.h"
+#include "general/temporal.h"
 
 #include <liblwgeom.h>
 #include "stbox.h"

diff --git a/point/include/tpoint_aggfuncs.h → include/point/tpoint_aggfuncs.h b/point/include/tpoint_aggfuncs.h → include/point/tpoint_aggfuncs.h
@@ -36,8 +36,8 @@
 #include <fmgr.h>
 #include <catalog/pg_type.h>
 
-#include "temporal.h"
-#include "skiplist.h"
+#include "general/temporal.h"
+#include "general/skiplist.h"
 
 /*****************************************************************************/
 

diff --git a/point/include/tpoint_analytics.h → include/point/tpoint_analytics.h b/point/include/tpoint_analytics.h → include/point/tpoint_analytics.h
@@ -35,7 +35,7 @@
 #include <postgres.h>
 #include <fmgr.h>
 
-#include "temporaltypes.h"
+#include "general/temporaltypes.h"
 
 /*****************************************************************************/
 

diff --git a/point/include/tpoint_analyze.h → include/point/tpoint_analyze.h b/point/include/tpoint_analyze.h → include/point/tpoint_analyze.h
diff --git a/point/include/tpoint_boxops.h → include/point/tpoint_boxops.h b/point/include/tpoint_boxops.h → include/point/tpoint_boxops.h
@@ -38,8 +38,8 @@
 #include <catalog/pg_type.h>
 #include <liblwgeom.h>
 
-#include "temporal.h"
-#include "temporal_util.h"
+#include "general/temporal.h"
+#include "general/temporal_util.h"
 #include "stbox.h"
 
 /*****************************************************************************/

diff --git a/point/include/tpoint_datagen.h → include/point/tpoint_datagen.h b/point/include/tpoint_datagen.h → include/point/tpoint_datagen.h
diff --git a/point/include/tpoint_distance.h → include/point/tpoint_distance.h b/point/include/tpoint_distance.h → include/point/tpoint_distance.h
@@ -38,7 +38,7 @@
 #include <catalog/pg_type.h>
 #include <float.h>
 
-#include "temporal.h"
+#include "general/temporal.h"
 #include <liblwgeom.h>
 #include "tpoint.h"
 

diff --git a/point/include/tpoint_gist.h → include/point/tpoint_gist.h b/point/include/tpoint_gist.h → include/point/tpoint_gist.h
@@ -35,7 +35,7 @@
 #include <postgres.h>
 #include <catalog/pg_type.h>
 #include <utils/builtins.h>
-#include "temporal.h"
+#include "general/temporal.h"
 
 /*****************************************************************************/
 

diff --git a/point/include/tpoint_in.h → include/point/tpoint_in.h b/point/include/tpoint_in.h → include/point/tpoint_in.h
diff --git a/point/include/tpoint_out.h → include/point/tpoint_out.h b/point/include/tpoint_out.h → include/point/tpoint_out.h
diff --git a/point/include/tpoint_parser.h → include/point/tpoint_parser.h b/point/include/tpoint_parser.h → include/point/tpoint_parser.h
@@ -32,7 +32,7 @@
 
 #include <postgres.h>
 #include <catalog/pg_type.h>
-#include "temporal.h"
+#include "general/temporal.h"
 
 /*****************************************************************************/
 

diff --git a/point/include/tpoint_posops.h → include/point/tpoint_posops.h b/point/include/tpoint_posops.h → include/point/tpoint_posops.h
@@ -34,7 +34,7 @@
 
 #include <postgres.h>
 #include <catalog/pg_type.h>
-#include "temporal.h"
+#include "general/temporal.h"
 
 /*****************************************************************************/
 

diff --git a/point/include/tpoint_selfuncs.h → include/point/tpoint_selfuncs.h b/point/include/tpoint_selfuncs.h → include/point/tpoint_selfuncs.h
@@ -39,7 +39,7 @@
 #include <catalog/pg_statistic.h>
 #include <utils/selfuncs.h>
 
-#include "tempcache.h"
+#include "general/tempcache.h"
 #include "tpoint.h"
 #include "tpoint_analyze.h"
 

diff --git a/point/include/tpoint_spatialfuncs.h → include/point/tpoint_spatialfuncs.h b/point/include/tpoint_spatialfuncs.h → include/point/tpoint_spatialfuncs.h
@@ -37,7 +37,7 @@
 #include <postgres.h>
 #include <liblwgeom.h>
 
-#include "temporal.h"
+#include "general/temporal.h"
 #include "tpoint.h"
 
 /*****************************************************************************/