summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt66
-rw-r--r--GenVersion.bat28
-rw-r--r--Makefile.in44
-rwxr-xr-xgen_version.sh19
-rw-r--r--pcap-bpf.c2
-rw-r--r--pcap-dag.c2
-rw-r--r--pcap-dlpi.c2
-rw-r--r--pcap-dos.c2
-rw-r--r--pcap-int.h6
-rw-r--r--pcap-libdlpi.c2
-rw-r--r--pcap-linux.c2
-rw-r--r--pcap-nit.c2
-rw-r--r--pcap-npf.c2
-rw-r--r--pcap-null.c2
-rw-r--r--pcap-pf.c2
-rw-r--r--pcap-septel.c2
-rw-r--r--pcap-sita.c2
-rw-r--r--pcap-snf.c2
-rw-r--r--pcap-snit.c2
-rw-r--r--pcap-snoop.c2
-rw-r--r--pcap_version.h.in1
-rw-r--r--version.c5
-rw-r--r--version.c.in3
23 files changed, 17 insertions, 185 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b7db9c7..1ec1d552 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -463,6 +463,7 @@ set(PROJECT_SOURCE_LIST_C
savefile.c
sf-pcap-ng.c
sf-pcap.c
+ version.c
bpf/net/bpf_filter.c
)
@@ -1334,70 +1335,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.]
endif()
endif()
-if(WIN32 AND NOT MSYS AND NOT ${CMAKE_CROSSCOMPILING})
- #
- # CMake does not love Windows. Convert its UN*X-style paths to
- # Windows-style paths to hand to Windows programs.
- #
- file(TO_NATIVE_PATH "${pcap_SOURCE_DIR}/GenVersion.bat" GenVersion_path)
- file(TO_NATIVE_PATH "${pcap_SOURCE_DIR}/VERSION" VERSION_path)
- file(TO_NATIVE_PATH "${pcap_SOURCE_DIR}/version.c.in" version_c_in_path)
- file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/version.c" version_c_path)
- file(TO_NATIVE_PATH "${pcap_SOURCE_DIR}/pcap_version.h.in" pcap_version_h_in_path)
- file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h" pcap_version_h_path)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.c
- SOURCE ${pcap_SOURCE_DIR}/VERSION
- COMMAND ${GenVersion_path} ${VERSION_path} ${version_c_in_path} ${version_c_path}
- DEPENDS ${pcap_SOURCE_DIR}/VERSION ${pcap_SOURCE_DIR}/version.c.in
- )
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h
- SOURCE ${pcap_SOURCE_DIR}/VERSION ${pcap_SOURCE_DIR}/pcap_version.h.in
- COMMAND ${GenVersion_path} ${VERSION_path} ${pcap_version_h_in_path} ${pcap_version_h_path}
- DEPENDS ${pcap_SOURCE_DIR}/VERSION ${pcap_SOURCE_DIR}/pcap_version.h.in
- )
-else(WIN32 AND NOT MSYS AND NOT ${CMAKE_CROSSCOMPILING})
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.c
- SOURCE ${pcap_SOURCE_DIR}/VERSION
- COMMAND ${pcap_SOURCE_DIR}/gen_version.sh ${pcap_SOURCE_DIR}/VERSION ${pcap_SOURCE_DIR}/version.c.in ${CMAKE_CURRENT_BINARY_DIR}/version.c
- DEPENDS ${pcap_SOURCE_DIR}/VERSION
- )
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h
- SOURCE ${pcap_SOURCE_DIR}/VERSION
- COMMAND ${pcap_SOURCE_DIR}/gen_version.sh ${pcap_SOURCE_DIR}/VERSION ${pcap_SOURCE_DIR}/pcap_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h
- DEPENDS ${pcap_SOURCE_DIR}/VERSION
- )
-
- #
- # Since version.c does not exists yet when cmake is run, mark
- # it as generated.
- #
- set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/version.c PROPERTIES
- GENERATED TRUE
- )
-
- #
- # Add version.c to the list of sources.
- #
- set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} ${CMAKE_CURRENT_BINARY_DIR}/version.c)
-endif(WIN32 AND NOT MSYS AND NOT ${CMAKE_CROSSCOMPILING})
-
-#
-# Since pcap_version.h does not exists yet when cmake is run, mark
-# it as generated.
-#
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h PROPERTIES
- GENERATED TRUE
-)
-
-#
-# Add pcap_version.h to the list of headers.
-#
-set(PROJECT_SOURCE_LIST_H ${PROJECT_SOURCE_LIST_H} ${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h)
-
source_group("Source Files" FILES ${PROJECT_SOURCE_LIST_C})
source_group("Header Files" FILES ${PROJECT_SOURCE_LIST_H})
@@ -1423,7 +1360,6 @@ add_custom_target(SerializeTarget
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/grammar.c
${CMAKE_CURRENT_BINARY_DIR}/scanner.c
- ${CMAKE_CURRENT_BINARY_DIR}/version.c
)
set_source_files_properties(${PROJECT_EXTERNAL_OBJECT_LIST} PROPERTIES
diff --git a/GenVersion.bat b/GenVersion.bat
deleted file mode 100644
index ba85d77f..00000000
--- a/GenVersion.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@if exist ".devel" (
- @echo on
-) else @if not exist ".devel" (
- @echo off
-)
-
-REM
-REM Automatically generate pcap_version.h based on pcap_version.h.in
-REM for Windows
-REM The version string comes from VERSION
-REM
-
-setlocal enableextensions disabledelayedexpansion
-
-set "search=%%%%LIBPCAP_VERSION%%%%"
-set /p replace=<%1
-
-if exist %3 del %3 2>nul
-
-for /f "delims=" %%i in ('type %2' ) do (
- set "line=%%i"
- setlocal enabledelayedexpansion
- set "line=!line:%search%=%replace%!"
- >>%3 echo(!line!
- endlocal
-)
-
-echo pcap_version.h generated
diff --git a/Makefile.in b/Makefile.in
index 7e1358c2..74cf7c1d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,10 +86,10 @@ YACC = @YACC@
PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @NETFILTER_SRC@ @DBUS_SRC@ @NETMAP_SRC@ @RDMA_SRC@
FSRC = @V_FINDALLDEVS@
SSRC = @SSRC@
-CSRC = pcap.c gencode.c optimize.c nametoaddr.c \
- etherent.c savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
- bpf_image.c bpf_dump.c
-GENSRC = scanner.c grammar.c bpf_filter.c version.c
+CSRC = pcap.c gencode.c optimize.c nametoaddr.c etherent.c \
+ savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
+ version.c bpf_image.c bpf_dump.c
+GENSRC = scanner.c grammar.c bpf_filter.c
LIBOBJS = @LIBOBJS@
SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
@@ -169,7 +169,7 @@ TESTS_SRC = \
tests/selpolltest.c
GENHDR = \
- scanner.h grammar.h pcap_version.h
+ scanner.h grammar.h
TAGFILES = \
$(SRC) $(HDR)
@@ -257,7 +257,6 @@ EXTRA_DIST = \
ChmodBPF/StartupParameters.plist \
CREDITS \
CMakeLists.txt \
- GenVersion.bat \
INSTALL.txt \
LICENSE \
Makefile.in \
@@ -298,7 +297,6 @@ EXTRA_DIST = \
fad-getad.c \
fad-gifc.c \
fad-glifc.c \
- gen_version.sh \
grammar.y \
install-sh \
lbl/os-aix4.h \
@@ -370,13 +368,11 @@ EXTRA_DIST = \
pcap-tc.h \
pcap-usb-linux.c \
pcap-usb-linux.h \
- pcap_version.h.in \
rpcap-protocol.c \
sockutils.c \
sockutils.h \
scanner.l \
tests/CMakeLists.txt \
- version.c.in \
Win32/Prj/wpcap.sln \
Win32/Prj/wpcap.vcxproj \
Win32/Prj/wpcap.vcxproj.filters
@@ -478,20 +474,6 @@ scanner.h: scanner.c
scanner.o: scanner.c grammar.h
$(CC) $(FULL_CFLAGS) -c scanner.c
-pcap-bpf.o: pcap_version.h
-pcap-dag.o: pcap_version.h
-pcap-dlpi.o: pcap_version.h
-pcap-libdlpi.o: pcap_version.h
-pcap-linux.o: pcap_version.h
-pcap-nit.o: pcap_version.h
-pcap-null.o: pcap_version.h
-pcap-pf.o: pcap_version.h
-pcap-septel.o: pcap_version.h
-pcap-sita.o: pcap_version.h
-pcap-snf.o: pcap_version.h
-pcap-snit.o: pcap_version.h
-pcap-snoop.o: pcap_version.h
-
grammar.c: $(srcdir)/grammar.y
$(YACC) -p pcap_ -o grammar.c -d $<
grammar.h: grammar.c
@@ -507,28 +489,12 @@ grammar.o: grammar.c scanner.h
gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
$(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
-version.o: version.c
- $(CC) $(FULL_CFLAGS) -c version.c
-
snprintf.o: $(srcdir)/missing/snprintf.c
$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
strtok_r.o: $(srcdir)/missing/strtok_r.c
$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c
-version.c: $(srcdir)/VERSION $(srcdir)/version.c.in $(srcdir)/gen_version.sh
- #
- # Older programs import this if they want to show the
- # libpcap version number, rather than calling
- # pcap_lib_version(), so we need to export it.
- #
- @rm -f $@
- $(srcdir)/gen_version.sh $(srcdir)/VERSION $(srcdir)/version.c.in $@
-
-pcap_version.h: $(srcdir)/VERSION $(srcdir)/pcap_version.h.in $(srcdir)/gen_version.sh
- @rm -f $@
- $(srcdir)/gen_version.sh $(srcdir)/VERSION $(srcdir)/pcap_version.h.in $@
-
bpf_filter.c: $(srcdir)/bpf/net/bpf_filter.c
rm -f bpf_filter.c
ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
diff --git a/gen_version.sh b/gen_version.sh
deleted file mode 100755
index 6bc2e762..00000000
--- a/gen_version.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-print_version_string()
-{
- if grep GIT "$1" >/dev/null
- then
- read ver <"$1"
- echo $ver | tr -d '\012'
- date +_%Y_%m_%d
- else
- cat "$1"
- fi
-}
-if test $# != 3
-then
- echo "Usage: gen_version.sh <version file> <template> <output file>" 1>&2
- exit 1
-fi
-version_string=`print_version_string "$1"`
-sed "s/%%LIBPCAP_VERSION%%/$version_string/" "$2" >"$3"
diff --git a/pcap-bpf.c b/pcap-bpf.c
index 78813a5d..e48a64ba 100644
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -3177,8 +3177,6 @@ pcap_set_datalink_bpf(pcap_t *p, int dlt)
return (0);
}
-#include "pcap_version.h"
-
/*
* Platform-specific information.
*/
diff --git a/pcap-dag.c b/pcap-dag.c
index a70c76a3..47db766d 100644
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -1360,8 +1360,6 @@ pcap_create_interface(const char *device, char *errbuf)
return NULL;
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index fc46d215..619e70e2 100644
--- a/pcap-dlpi.c
+++ b/pcap-dlpi.c
@@ -1871,8 +1871,6 @@ pcap_create_interface(const char *device _U_, char *ebuf)
return (p);
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-dos.c b/pcap-dos.c
index ff8d5643..54690d2a 100644
--- a/pcap-dos.c
+++ b/pcap-dos.c
@@ -1523,8 +1523,6 @@ static void pktq_clear (struct rx_ringbuf *q)
#endif /* USE_32BIT_DRIVERS */
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-int.h b/pcap-int.h
index 9e8283e9..51ff2e99 100644
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -36,6 +36,12 @@
#include <pcap/pcap.h>
+/*
+ * Version string.
+ * Uses PACKAGE_VERSION from config.h.
+ */
+#define PCAP_VERSION_STRING "libpcap version " PACKAGE_VERSION
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/pcap-libdlpi.c b/pcap-libdlpi.c
index d19a95b0..c013bfc0 100644
--- a/pcap-libdlpi.c
+++ b/pcap-libdlpi.c
@@ -462,8 +462,6 @@ pcap_create_interface(const char *device _U_, char *ebuf)
return (p);
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-linux.c b/pcap-linux.c
index fd839416..9abe9d29 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -6955,8 +6955,6 @@ pcap_set_protocol(pcap_t *p, int protocol)
return (0);
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-nit.c b/pcap-nit.c
index d2a9684d..6f7092e9 100644
--- a/pcap-nit.c
+++ b/pcap-nit.c
@@ -394,8 +394,6 @@ pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
return (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound));
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-npf.c b/pcap-npf.c
index 8ade6f1b..4bc5347d 100644
--- a/pcap-npf.c
+++ b/pcap-npf.c
@@ -1716,8 +1716,6 @@ pcap_lookupnet(device, netp, maskp, errbuf)
return (0);
}
-#include "pcap_version.h"
-
static const char *pcap_lib_version_string;
#ifdef HAVE_VERSION_H
diff --git a/pcap-null.c b/pcap-null.c
index e60cdd0f..92a5e2d8 100644
--- a/pcap-null.c
+++ b/pcap-null.c
@@ -55,8 +55,6 @@ pcap_lookupnet(const char *device _U_, bpf_u_int32 *netp _U_,
}
#endif
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-pf.c b/pcap-pf.c
index b88dd3e5..8de706a9 100644
--- a/pcap-pf.c
+++ b/pcap-pf.c
@@ -633,8 +633,6 @@ pcap_setfilter_pf(pcap_t *p, struct bpf_program *fp)
return (0);
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-septel.c b/pcap-septel.c
index 22dbda07..dce84a1e 100644
--- a/pcap-septel.c
+++ b/pcap-septel.c
@@ -352,8 +352,6 @@ pcap_create_interface(const char *device, char *errbuf)
return (NULL);
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-sita.c b/pcap-sita.c
index ea63f7cd..8a4f6d8b 100644
--- a/pcap-sita.c
+++ b/pcap-sita.c
@@ -1060,8 +1060,6 @@ int pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf) {
return 0;
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-snf.c b/pcap-snf.c
index 464cfd23..ade3783b 100644
--- a/pcap-snf.c
+++ b/pcap-snf.c
@@ -592,8 +592,6 @@ pcap_create_interface(const char *device, char *errbuf)
return NULL;
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-snit.c b/pcap-snit.c
index a129b11e..24368f6e 100644
--- a/pcap-snit.c
+++ b/pcap-snit.c
@@ -470,8 +470,6 @@ pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
return (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound));
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap-snoop.c b/pcap-snoop.c
index facf2fdd..b5fbeba2 100644
--- a/pcap-snoop.c
+++ b/pcap-snoop.c
@@ -445,8 +445,6 @@ pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
return (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound));
}
-#include "pcap_version.h"
-
/*
* Libpcap version string.
*/
diff --git a/pcap_version.h.in b/pcap_version.h.in
deleted file mode 100644
index 2ae91d04..00000000
--- a/pcap_version.h.in
+++ /dev/null
@@ -1 +0,0 @@
-#define PCAP_VERSION_STRING "libpcap version %%LIBPCAP_VERSION%%"
diff --git a/version.c b/version.c
new file mode 100644
index 00000000..0dc3abde
--- /dev/null
+++ b/version.c
@@ -0,0 +1,5 @@
+#include "config.h"
+
+#include <pcap/funcattrs.h>
+
+PCAP_API_DEF char pcap_version[] = PACKAGE_VERSION;
diff --git a/version.c.in b/version.c.in
deleted file mode 100644
index 010691fc..00000000
--- a/version.c.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <pcap/funcattrs.h>
-PCAP_API_DEF
-char pcap_version[] = "%%LIBPCAP_VERSION%%";
View Lorry Controller Status