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).

diff --git a/.gitignore b/.gitignore
index 9390002883e531ac28eeb00424dbb2712408d671..4e3f7e6c8bdd0dd697cfe93ef23b2e66b3ce8cec 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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 9c42ce93d927dbc9be5d2dafe4d863709e502613..6c648a2b33cc920f9c9e4d58438f3aea7af06b78 100644 (file)
--- 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 09a068ef479127e49bcaa8e4baa40f7f06aff8ae..7f4ce44e2249b7fed169bf78972da0508126c6d4 100644 (file)
--- 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 338239f0b75678b213ea626e936ba62e056c1377..a7bca48e79e9ff94773f74e441be0f906c0586cb 100644 (file)
--- 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,