diff options
| author | Daiki Ueno <dueno@redhat.com> | 2019-05-20 18:16:40 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2019-06-18 14:17:28 +0200 |
| commit | 1e8ca781b983cb31d62e21a3a61f25be1fcc694f (patch) | |
| tree | a85d0ed83e62fa63a11760fbf83c2b6076cd7455 | |
| parent | 045d7546fc317deefc2d84d524a211ce6ab4869b (diff) | |
virtual: Rename virtual-fixed.c to virtual-fixed-generated.h
Previously the generated .c file was included in another source file,
which is not supported in some build systems (e.g., meson).
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .travis/linux/after_success.sh | 2 | ||||
| -rw-r--r-- | p11-kit/Makefile.am | 6 | ||||
| -rw-r--r-- | p11-kit/virtual.c | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -98,7 +98,7 @@ x86_64-w64-mingw32 /p11-kit/p11-kit-1.pc /p11-kit/pkcs11.conf.example /p11-kit/p11-kit-server.service -/p11-kit/virtual-fixed.c +/p11-kit/virtual-fixed-generated.h /p11-kit/*.gnu.c /p11-kit-remote diff --git a/.travis/linux/after_success.sh b/.travis/linux/after_success.sh index 9c42ce9..6c648a2 100644 --- a/.travis/linux/after_success.sh +++ b/.travis/linux/after_success.sh @@ -9,5 +9,5 @@ if test x"$COVERAGE" = xyes; then docker exec \ -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" \ -e TRAVIS_BRANCH="$TRAVIS_BRANCH" \ - $CONTAINER sh -c "cd $BUILDDIR && cpp-coveralls -b $BUILDDIR -E '(^|.*/)(frob|mock|test)-.*|(^|.*/)(virtual-fixed\.c)' --gcov-options '\-lp'" + $CONTAINER sh -c "cd $BUILDDIR && cpp-coveralls -b $BUILDDIR -E '(^|.*/)(frob|mock|test)-.*|(^|.*/)(virtual-fixed-generated\.h)' --gcov-options '\-lp'" fi diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index 09a068e..7f4ce44 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -29,14 +29,14 @@ COMMON_SRCS = \ $(inc_HEADERS) BUILT_SOURCES += \ - p11-kit/virtual-fixed.c \ + p11-kit/virtual-fixed-generated.h \ $(NULL) CLEANFILES += \ - p11-kit/virtual-fixed.c \ + p11-kit/virtual-fixed-generated.h \ $(NULL) -p11-kit/virtual-fixed.c: Makefile +p11-kit/virtual-fixed-generated.h: Makefile $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ echo; \ diff --git a/p11-kit/virtual.c b/p11-kit/virtual.c index 338239f..a7bca48 100644 --- a/p11-kit/virtual.c +++ b/p11-kit/virtual.c @@ -3056,7 +3056,7 @@ CK_X_FUNCTION_LIST p11_virtual_base = { base_C_WaitForSlotEvent }; -#include "p11-kit/virtual-fixed.c" +#include "p11-kit/virtual-fixed-generated.h" static CK_FUNCTION_LIST * p11_virtual_wrap_fixed (p11_virtual *virt, |