aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/CMakeLists.txt1
-rw-r--r--wiretap/Makefile.am11
-rw-r--r--wiretap/nettrace_3gpp_32_423.c2
3 files changed, 11 insertions, 3 deletions
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 883106a58c..72b2d0daec 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -81,6 +81,7 @@ set(WIRETAP_FILES
vwr.c
wtap.c
wtap_opttypes.c
+ ${CMAKE_SOURCE_DIR}/ws_version_info.c
)
if (WERROR_COMMON_FLAGS)
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 597e77d27b..6414645942 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -36,6 +36,9 @@ CLEANFILES = \
libwiretap_generated.la \
*~
+DISTCLEANFILES = \
+ ws_version_info.c
+
MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \
Makefile.in
@@ -46,14 +49,15 @@ MAINTAINERCLEANFILES = \
#files with the "stop on warning" barrier.
libwiretap_la_SOURCES = \
$(NONGENERATED_C_FILES) \
- $(NONGENERATED_HEADER_FILES)
+ $(NONGENERATED_HEADER_FILES) \
+ ws_version_info.c
libwiretap_generated_la_SOURCES = \
$(GENERATED_C_FILES)
libwiretap_generated_la_CFLAGS = $(GENERATED_CFLAGS)
-BUILT_SOURCES = $(GENERATED_HEADER_FILES)
+BUILT_SOURCES = $(GENERATED_HEADER_FILES) ws_version_info.c
EXTRA_DIST = \
.editorconfig \
@@ -82,6 +86,9 @@ ascend.c: $(srcdir)/ascend.y ascend_scanner_lex.h
fi
$(AM_V_YACC)$(YACC) -d -p ascend -o ascend.c $(srcdir)/ascend.y
+ws_version_info.c: $(top_srcdir)/ws_version_info.c
+ $(LN_S) $<
+
# ABI compliance checker can be obtained from
# http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
# Checked using version 1.21.12
diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c
index 1b388b3b15..a93ff1d9ac 100644
--- a/wiretap/nettrace_3gpp_32_423.c
+++ b/wiretap/nettrace_3gpp_32_423.c
@@ -42,7 +42,7 @@
#include <wsutil/buffer.h>
#include "wsutil/tempfile.h"
#include "wsutil/os_version_info.h"
-#include "wsutil/ws_version_info.h"
+#include "ws_version_info.h"
#include "wsutil/str_util.h"