diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-11-21 02:05:36 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-11-21 02:05:36 +0000 |
| commit | 26325020a248a9708f384c99586593b40353e45d (patch) | |
| tree | 645ef966152a990fbdb636abac1963596e735eea | |
| parent | 31b216d8ce9fdd46504e1ba03d61cd7ff663fa6c (diff) | |
| download | wireshark-26325020a248a9708f384c99586593b40353e45d.tar.gz | |
Try to get qmake to create wireshark-tap-register.c.
svn path=/trunk/; revision=53466
| -rw-r--r-- | Makefile.nmake | 3 | ||||
| -rw-r--r-- | ui/qt/QtShark.pro | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 7947df6869..73a297ee92 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -478,6 +478,9 @@ guilibsdll = $(guilibsdll) HHC_LIBS = $(HHC_LIBS) +SH = $(SH) +PYTHON = $(PYTHON) + MSVC_VARIANT = $(MSVC_VARIANT) MSVCR_DLL = "$(MSVCR_DLL:\=/)" diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 604f54f8ac..b571c27d7c 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -157,6 +157,25 @@ win32 { } } +SOURCES_TAP = \ + stats_tree_dialog.cpp + +tap_register.name = Generate wireshark-tap-register.c +tap_register.input = SOURCES_TAP +tap_register.output = wireshark-tap-register.c +tap_register.variable_out = SOURCES +win32 { + isEmpty(PYTHON) { + tap_register.commands = $${SH} ../../tools/make-tapreg-dotc wireshark-tap-register.c . $$SOURCES_TAP + } else { + tap_register.commands = $${PYTHON} "../../tools/make-tap-reg.py" . taps $$SOURCES_TAP + } +} else { + tap_register.commands = python ../../tools/make-tap-reg.py . taps $$SOURCES_TAP +} +#tap_register.CONFIG += no_link +QMAKE_EXTRA_COMPILERS += tap_register + INCLUDEPATH += ../.. ../../wiretap win32:INCLUDEPATH += \ $${WIRESHARK_LIB_DIR}/gtk2/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk2/lib/glib-2.0/include \ @@ -188,7 +207,8 @@ SOURCES_WS_C = \ ../../proto_hier_stats.c \ ../../summary.c \ ../../sync_pipe_write.c \ - ../../version_info.c + ../../version_info.c \ + wireshark-tap-register.c unix:SOURCES_WS_C += ../../capture-pcap-util-unix.c win32:SOURCES_WS_C += \ |