diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/Makefile.am | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 2 | ||||
| -rw-r--r-- | epan/print.c | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 82d0169d3e..33d63a6c02 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -168,6 +168,7 @@ set(LIBWIRESHARK_FILES uat.c value_string.c xdlc.c + ${CMAKE_SOURCE_DIR}/ws_version_info.c ) set(LIBWIRESHARK_CLEAN_FILES diff --git a/epan/Makefile.am b/epan/Makefile.am index a7af0d83a2..f16ce7ff42 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -54,7 +54,8 @@ libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ #files with the "stop on warning" barrier. libwireshark_la_SOURCES = \ $(LIBWIRESHARK_SRC) \ - $(LIBWIRESHARK_INCLUDES) + $(LIBWIRESHARK_INCLUDES) \ + ws_version_info.c libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL @@ -104,7 +105,8 @@ CLEANFILES = \ DISTCLEANFILES = \ $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ - dtd_grammar.out + dtd_grammar.out \ + ws_version_info.c MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_GENERATED_C_FILES) \ @@ -113,7 +115,8 @@ MAINTAINERCLEANFILES = \ BUILT_SOURCES = \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) + $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ + ws_version_info.c # # Add the object files for missing routines, if any. @@ -194,6 +197,9 @@ dtd_grammar.h: dtd_grammar.c dtd_grammar.c : $(LEMON) $(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon $(AM_V_LEMON)$(LEMON) T=$(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon +ws_version_info.c: $(top_srcdir)/ws_version_info.c + $(LN_S) $< + tvbtest.o exntest.o oids_test.o: exceptions.h update-sminmpec: diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 29df42fc27..8801e9d2ed 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -47,7 +47,7 @@ #include <wsutil/str_util.h> #include <wsutil/report_err.h> #include <wsutil/pint.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include "packet-x509af.h" #include "packet-x509if.h" #include "packet-ssl-utils.h" diff --git a/epan/print.c b/epan/print.c index 4af1acb102..566af2ee2b 100644 --- a/epan/print.c +++ b/epan/print.c @@ -36,7 +36,7 @@ #include <epan/print.h> #include <epan/charsets.h> #include <wsutil/filesystem.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wsutil/utf8_entities.h> #include <ftypes/ftypes-int.h> |