From c66781ed4d8beb611a1155be540cffb3df7ce146 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 27 Apr 2021 13:12:09 +0200 Subject: Rename libcrystfel's config.h to libcrystfel-config.h This removes the big potential for confusion, which has happened several times (see e.g. 095cbebaf6). It also fixes in-tree builds with CMake (but seriously, always use out-of-tree builds). Fixes #2. --- libcrystfel/CMakeLists.txt | 3 +-- libcrystfel/config.h.cmake.in | 17 ----------------- libcrystfel/config.h.in | 15 --------------- libcrystfel/libcrystfel-config.h.cmake.in | 17 +++++++++++++++++ libcrystfel/libcrystfel-config.h.meson.in | 15 +++++++++++++++ libcrystfel/meson.build | 4 ++-- libcrystfel/src/cell-utils.c | 4 +--- libcrystfel/src/cell.c | 4 +--- libcrystfel/src/colscale.c | 5 +---- libcrystfel/src/crystal.c | 4 +--- libcrystfel/src/datatemplate.c | 4 +--- libcrystfel/src/detgeom.c | 5 +---- libcrystfel/src/fom.c | 4 +--- libcrystfel/src/geometry.c | 5 +---- libcrystfel/src/image-cbf.c | 4 +--- libcrystfel/src/image-hdf5.c | 4 +--- libcrystfel/src/image-msgpack.c | 4 +--- libcrystfel/src/image.c | 4 +--- libcrystfel/src/index.c | 4 +--- libcrystfel/src/indexers/asdf.c | 4 +--- libcrystfel/src/indexers/dirax.c | 5 +---- libcrystfel/src/indexers/felix.c | 5 +---- libcrystfel/src/indexers/fromfile.c | 2 ++ libcrystfel/src/indexers/mosflm.c | 5 +---- libcrystfel/src/indexers/pinkindexer.c | 4 +--- libcrystfel/src/indexers/taketwo.c | 4 +--- libcrystfel/src/indexers/xds.c | 5 +---- libcrystfel/src/indexers/xgandalf.c | 4 +--- libcrystfel/src/integer_matrix.c | 4 +--- libcrystfel/src/integration.c | 5 +---- libcrystfel/src/peakfinder8.c | 4 +--- libcrystfel/src/peaks.c | 4 +--- libcrystfel/src/predict-refine.c | 5 +---- libcrystfel/src/rational.c | 4 +--- libcrystfel/src/reflist-utils.c | 4 +--- libcrystfel/src/reflist.c | 4 +--- libcrystfel/src/spectrum.c | 4 +--- libcrystfel/src/stream.c | 5 +---- libcrystfel/src/symmetry.c | 4 +--- libcrystfel/src/thread-pool.c | 4 +--- libcrystfel/src/utils.c | 4 +--- 41 files changed, 71 insertions(+), 148 deletions(-) delete mode 100644 libcrystfel/config.h.cmake.in delete mode 100644 libcrystfel/config.h.in create mode 100644 libcrystfel/libcrystfel-config.h.cmake.in create mode 100644 libcrystfel/libcrystfel-config.h.meson.in (limited to 'libcrystfel') diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt index 26ac2302..1fef33a4 100644 --- a/libcrystfel/CMakeLists.txt +++ b/libcrystfel/CMakeLists.txt @@ -27,7 +27,7 @@ set(CMAKE_REQUIRED_LIBRARIES "-lz") check_symbol_exists(gzbuffer "zlib.h" HAVE_GZBUFFER) unset(CMAKE_REQUIRED_LIBRARIES) -configure_file(config.h.cmake.in config.h) +configure_file(libcrystfel-config.h.cmake.in libcrystfel-config.h) bison_target(symopp src/symop.y ${CMAKE_CURRENT_BINARY_DIR}/symop-parse.c COMPILE_FLAGS --report=all) flex_target(symopl src/symop.l ${CMAKE_CURRENT_BINARY_DIR}/symop-lex.c @@ -140,7 +140,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_include_directories(${PROJECT_NAME} INTERFACE ${PROJECT_SOURCE_DIR}/src) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -add_definitions(-DHAVE_CONFIG_H) target_include_directories(${PROJECT_NAME} PRIVATE ${HDF5_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME} PRIVATE util ${HDF5_C_LIBRARIES} ${ZLIB_LIBRARIES} diff --git a/libcrystfel/config.h.cmake.in b/libcrystfel/config.h.cmake.in deleted file mode 100644 index 1a81ffde..00000000 --- a/libcrystfel/config.h.cmake.in +++ /dev/null @@ -1,17 +0,0 @@ -/* config.h for libcrystfel */ - -#cmakedefine HAVE_CLOCK_GETTIME -#cmakedefine HAVE_FFTW -#cmakedefine HAVE_XGANDALF -#cmakedefine HAVE_PINKINDEXER -#cmakedefine HAVE_FDIP -#cmakedefine HAVE_CURSES -#cmakedefine HAVE_GZBUFFER -#cmakedefine HAVE_GDKPIXBUF -#cmakedefine HAVE_LIBCCP4 -#cmakedefine HAVE_MSGPACK - -#cmakedefine HAVE_FORKPTY_PTY_H -#cmakedefine HAVE_FORKPTY_UTIL_H - -#define CRYSTFEL_VERSIONSTRING "${CRYSTFEL_VERSION}" diff --git a/libcrystfel/config.h.in b/libcrystfel/config.h.in deleted file mode 100644 index 1cadfd02..00000000 --- a/libcrystfel/config.h.in +++ /dev/null @@ -1,15 +0,0 @@ -/* config.h for libcrystfel */ - -#mesondefine HAVE_FFTW -#mesondefine HAVE_XGANDALF -#mesondefine HAVE_PINKINDEXER -#mesondefine HAVE_FDIP -#mesondefine HAVE_CURSES -#mesondefine HAVE_GZBUFFER -#mesondefine HAVE_LIBCCP4 -#mesondefine HAVE_MSGPACK - -#mesondefine HAVE_FORKPTY_PTY_H -#mesondefine HAVE_FORKPTY_UTIL_H - -#define CRYSTFEL_VERSIONSTRING "${CRYSTFEL_VERSION}" diff --git a/libcrystfel/libcrystfel-config.h.cmake.in b/libcrystfel/libcrystfel-config.h.cmake.in new file mode 100644 index 00000000..1a81ffde --- /dev/null +++ b/libcrystfel/libcrystfel-config.h.cmake.in @@ -0,0 +1,17 @@ +/* config.h for libcrystfel */ + +#cmakedefine HAVE_CLOCK_GETTIME +#cmakedefine HAVE_FFTW +#cmakedefine HAVE_XGANDALF +#cmakedefine HAVE_PINKINDEXER +#cmakedefine HAVE_FDIP +#cmakedefine HAVE_CURSES +#cmakedefine HAVE_GZBUFFER +#cmakedefine HAVE_GDKPIXBUF +#cmakedefine HAVE_LIBCCP4 +#cmakedefine HAVE_MSGPACK + +#cmakedefine HAVE_FORKPTY_PTY_H +#cmakedefine HAVE_FORKPTY_UTIL_H + +#define CRYSTFEL_VERSIONSTRING "${CRYSTFEL_VERSION}" diff --git a/libcrystfel/libcrystfel-config.h.meson.in b/libcrystfel/libcrystfel-config.h.meson.in new file mode 100644 index 00000000..1cadfd02 --- /dev/null +++ b/libcrystfel/libcrystfel-config.h.meson.in @@ -0,0 +1,15 @@ +/* config.h for libcrystfel */ + +#mesondefine HAVE_FFTW +#mesondefine HAVE_XGANDALF +#mesondefine HAVE_PINKINDEXER +#mesondefine HAVE_FDIP +#mesondefine HAVE_CURSES +#mesondefine HAVE_GZBUFFER +#mesondefine HAVE_LIBCCP4 +#mesondefine HAVE_MSGPACK + +#mesondefine HAVE_FORKPTY_PTY_H +#mesondefine HAVE_FORKPTY_UTIL_H + +#define CRYSTFEL_VERSIONSTRING "${CRYSTFEL_VERSION}" diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 3ee9d495..8ed03454 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -121,8 +121,8 @@ libcrystfel_sources = ['src/image.c', symop_parse_ch, ] -configure_file(input : 'config.h.in', - output : 'config.h', +configure_file(input : 'libcrystfel-config.h.meson.in', + output : 'libcrystfel-config.h', configuration : conf_data) libcrystfel_conf_inc = include_directories('.') diff --git a/libcrystfel/src/cell-utils.c b/libcrystfel/src/cell-utils.c index bb654bc5..b2708fb2 100644 --- a/libcrystfel/src/cell-utils.c +++ b/libcrystfel/src/cell-utils.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/cell.c b/libcrystfel/src/cell.c index 2e944ddb..4dea2ce1 100644 --- a/libcrystfel/src/cell.c +++ b/libcrystfel/src/cell.c @@ -30,9 +30,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/colscale.c b/libcrystfel/src/colscale.c index 4a39de8d..80e9e51b 100644 --- a/libcrystfel/src/colscale.c +++ b/libcrystfel/src/colscale.c @@ -26,10 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include #include #include diff --git a/libcrystfel/src/crystal.c b/libcrystfel/src/crystal.c index c9f59bb7..71d707d6 100644 --- a/libcrystfel/src/crystal.c +++ b/libcrystfel/src/crystal.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include "crystal.h" #include "utils.h" diff --git a/libcrystfel/src/datatemplate.c b/libcrystfel/src/datatemplate.c index e47a83b3..f746b7f5 100644 --- a/libcrystfel/src/datatemplate.c +++ b/libcrystfel/src/datatemplate.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/detgeom.c b/libcrystfel/src/detgeom.c index fe247ba6..122dcd87 100644 --- a/libcrystfel/src/detgeom.c +++ b/libcrystfel/src/detgeom.c @@ -26,10 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include #include #include diff --git a/libcrystfel/src/fom.c b/libcrystfel/src/fom.c index af1ba8fe..33887bd8 100644 --- a/libcrystfel/src/fom.c +++ b/libcrystfel/src/fom.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/geometry.c b/libcrystfel/src/geometry.c index 68a532b8..e847711d 100644 --- a/libcrystfel/src/geometry.c +++ b/libcrystfel/src/geometry.c @@ -26,10 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include #include #include diff --git a/libcrystfel/src/image-cbf.c b/libcrystfel/src/image-cbf.c index c9de17df..2ea5f0a5 100644 --- a/libcrystfel/src/image-cbf.c +++ b/libcrystfel/src/image-cbf.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/image-hdf5.c b/libcrystfel/src/image-hdf5.c index 7af0e3a6..c939e136 100644 --- a/libcrystfel/src/image-hdf5.c +++ b/libcrystfel/src/image-hdf5.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/image-msgpack.c b/libcrystfel/src/image-msgpack.c index 2f7b4575..920634fe 100644 --- a/libcrystfel/src/image-msgpack.c +++ b/libcrystfel/src/image-msgpack.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index b40819ef..1e2b7a3c 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 37ced03d..c6876468 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/indexers/asdf.c b/libcrystfel/src/indexers/asdf.c index 0c57f9f0..a8943688 100644 --- a/libcrystfel/src/indexers/asdf.c +++ b/libcrystfel/src/indexers/asdf.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/indexers/dirax.c b/libcrystfel/src/indexers/dirax.c index 4b59f6cb..ef90a3f7 100644 --- a/libcrystfel/src/indexers/dirax.c +++ b/libcrystfel/src/indexers/dirax.c @@ -26,10 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include #include #include diff --git a/libcrystfel/src/indexers/felix.c b/libcrystfel/src/indexers/felix.c index a02f146f..dcd50613 100644 --- a/libcrystfel/src/indexers/felix.c +++ b/libcrystfel/src/indexers/felix.c @@ -27,10 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include /** \file felix.h */ diff --git a/libcrystfel/src/indexers/fromfile.c b/libcrystfel/src/indexers/fromfile.c index 1f3cc0da..9a99b242 100644 --- a/libcrystfel/src/indexers/fromfile.c +++ b/libcrystfel/src/indexers/fromfile.c @@ -29,6 +29,8 @@ * */ +#include + #include #include #include diff --git a/libcrystfel/src/indexers/mosflm.c b/libcrystfel/src/indexers/mosflm.c index b0e0b121..5d107234 100644 --- a/libcrystfel/src/indexers/mosflm.c +++ b/libcrystfel/src/indexers/mosflm.c @@ -54,10 +54,7 @@ * worth another look at the documentation. */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include #include #include diff --git a/libcrystfel/src/indexers/pinkindexer.c b/libcrystfel/src/indexers/pinkindexer.c index 5cb979a9..7da44f73 100644 --- a/libcrystfel/src/indexers/pinkindexer.c +++ b/libcrystfel/src/indexers/pinkindexer.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include "pinkindexer.h" diff --git a/libcrystfel/src/indexers/taketwo.c b/libcrystfel/src/indexers/taketwo.c index 1bccf1e0..4b481e93 100644 --- a/libcrystfel/src/indexers/taketwo.c +++ b/libcrystfel/src/indexers/taketwo.c @@ -86,9 +86,7 @@ * * Clean up the mess (cleanup_taketwo_obs_vecs()) */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/indexers/xds.c b/libcrystfel/src/indexers/xds.c index 3b2f2b87..3936f791 100644 --- a/libcrystfel/src/indexers/xds.c +++ b/libcrystfel/src/indexers/xds.c @@ -28,10 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include #include #include diff --git a/libcrystfel/src/indexers/xgandalf.c b/libcrystfel/src/indexers/xgandalf.c index 6b09f65c..ada0507a 100644 --- a/libcrystfel/src/indexers/xgandalf.c +++ b/libcrystfel/src/indexers/xgandalf.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include "xgandalf.h" diff --git a/libcrystfel/src/integer_matrix.c b/libcrystfel/src/integer_matrix.c index 7fcd07c4..c6527d82 100644 --- a/libcrystfel/src/integer_matrix.c +++ b/libcrystfel/src/integer_matrix.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c index 84763a08..45f5f677 100644 --- a/libcrystfel/src/integration.c +++ b/libcrystfel/src/integration.c @@ -26,10 +26,7 @@ * */ - -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/peakfinder8.c b/libcrystfel/src/peakfinder8.c index 641a154b..93a8cc06 100644 --- a/libcrystfel/src/peakfinder8.c +++ b/libcrystfel/src/peakfinder8.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c index d55ddd03..689239e5 100644 --- a/libcrystfel/src/peaks.c +++ b/libcrystfel/src/peaks.c @@ -33,9 +33,7 @@ */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/predict-refine.c b/libcrystfel/src/predict-refine.c index e5250ba4..b871f43a 100644 --- a/libcrystfel/src/predict-refine.c +++ b/libcrystfel/src/predict-refine.c @@ -27,10 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include #include #include diff --git a/libcrystfel/src/rational.c b/libcrystfel/src/rational.c index afffcf47..76aa7014 100644 --- a/libcrystfel/src/rational.c +++ b/libcrystfel/src/rational.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/reflist-utils.c b/libcrystfel/src/reflist-utils.c index 90f7b91b..889b03db 100644 --- a/libcrystfel/src/reflist-utils.c +++ b/libcrystfel/src/reflist-utils.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/reflist.c b/libcrystfel/src/reflist.c index 90c50e1f..b322e6e1 100644 --- a/libcrystfel/src/reflist.c +++ b/libcrystfel/src/reflist.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/spectrum.c b/libcrystfel/src/spectrum.c index bca293e9..78ad2e6e 100644 --- a/libcrystfel/src/spectrum.c +++ b/libcrystfel/src/spectrum.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index 68f623dd..89f59ddc 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -31,10 +31,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include #include #include diff --git a/libcrystfel/src/symmetry.c b/libcrystfel/src/symmetry.c index bd6d2e8f..af627c44 100644 --- a/libcrystfel/src/symmetry.c +++ b/libcrystfel/src/symmetry.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/thread-pool.c b/libcrystfel/src/thread-pool.c index 61849270..7860d698 100644 --- a/libcrystfel/src/thread-pool.c +++ b/libcrystfel/src/thread-pool.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/libcrystfel/src/utils.c b/libcrystfel/src/utils.c index c7c956fa..945fee15 100644 --- a/libcrystfel/src/utils.c +++ b/libcrystfel/src/utils.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include -- cgit v1.2.3