@dftest_bin@ \
@dumpcap_bin@ \
@rawshark_bin@
-bin_SCRIPTS = @idl2wrs_bin@
EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
randpkt text2pcap dumpcap rawshark
-EXTRA_SCRIPTS = idl2wrs
-
-idl2wrs: tools/idl2wrs.sh Makefile
- cp tools/idl2wrs.sh idl2wrs
- chmod +x idl2wrs
+bin_SCRIPTS = tools/idl2wrs
#
# Wireshark configuration files are put in $(pkgdatadir).
tpncp_DATA = \
tpncp/tpncp.dat
+#
+# Install the ui directory files in the "ui" subdirectory
+# of that directory
+#
+uidir = $(pkgdatadir)/ui
+ui_DATA = \
+ ui/gtk/ui/main-menubar-ui.xml
+
+#
+# Install the ui/gt directory files in the "ui/qt" subdirectory
+# of that directory
+#
+uiqtdir = $(pkgdatadir)/ui/qt
+uiqt_DATA = \
+ ui/qt/byte_view_tab.cpp \
+ ui/qt/byte_view_tab.h \
+ ui/qt/byte_view_text.cpp \
+ ui/qt/byte_view_text.h \
+ ui/qt/capture_file_dialog.cpp \
+ ui/qt/capture_file_dialog.h \
+ ui/qt/capture_info_dialog.cpp \
+ ui/qt/capture_info_dialog.h \
+ ui/qt/capture_interface_dialog.cpp \
+ ui/qt/capture_interface_dialog.h \
+ ui/qt/capture_start_24.png \
+ ui/qt/capture_start_active_24.png \
+ ui/qt/capture_stop_24.png \
+ ui/qt/color_dialog.cpp \
+ ui/qt/color_dialog.h \
+ ui/qt/color_utils.cpp \
+ ui/qt/color_utils.h \
+ ui/qt/dfilter_apply_hover.png \
+ ui/qt/dfilter_apply_normal.png \
+ ui/qt/dfilter_apply_pressed.png \
+ ui/qt/dfilter_bookmark_hover.png \
+ ui/qt/dfilter_bookmark_normal.png \
+ ui/qt/dfilter_bookmark_pressed.png \
+ ui/qt/dfilter_dropdown.png \
+ ui/qt/dfilter_erase_active.png \
+ ui/qt/dfilter_erase_normal.png \
+ ui/qt/dfilter_erase_selected.png \
+ ui/qt/dfilter_refresh_active.png \
+ ui/qt/dfilter_refresh_normal.png \
+ ui/qt/display_filter_16.svg \
+ ui/qt/display_filter_combo.cpp \
+ ui/qt/display_filter_combo.h \
+ ui/qt/display_filter_edit.cpp \
+ ui/qt/display_filter_edit.h \
+ ui/qt/display_filter.qrc \
+ ui/qt/fileset_dialog.cpp \
+ ui/qt/fileset_dialog.h \
+ ui/qt/gpl-template.txt \
+ ui/qt/interface_tree.cpp \
+ ui/qt/interface_tree.h \
+ ui/qt/label_stack.cpp \
+ ui/qt/label_stack.h \
+ ui/qt/main.cpp \
+ ui/qt/main_status_bar.cpp \
+ ui/qt/main_status_bar.h \
+ ui/qt/main_welcome.cpp \
+ ui/qt/main_welcome.h \
+ ui/qt/main_window.cpp \
+ ui/qt/main_window.h \
+ ui/qt/main_window.ui \
+ ui/qt/monospace_font.cpp \
+ ui/qt/monospace_font.h \
+ ui/qt/packet_list.cpp \
+ ui/qt/packet_list.h \
+ ui/qt/packet_list_model.cpp \
+ ui/qt/packet_list_model.h
#
# Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
# @GTK_LIBS@ (as those are also needed for X applications, and GTK+
# applications are X applications).
wireshark_LDADD = \
- gtk/libui.a \
- gtk/libui_dirty.a \
+ ui/gtk/libgtkui.a \
+ ui/gtk/libgtkui_dirty.a \
+ ui/libui.a \
codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
- @SSL_LIBS@ \
+ @SSL_LIBS@ \
$(plugin_ldadd) \
- @PCRE_LIBS@ \
@PCAP_LIBS@ \
@GTK_LIBS@ -lm \
@C_ARES_LIBS@ \
@KRB5_LIBS@ \
@LAUNCHSERVICES_FRAMEWORKS@ \
@CORESERVICES_FRAMEWORKS@ \
+ @PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@ \
# Libraries and plugin flags with which to link tshark.
tshark_LDADD = \
+ ui/cli/libcliui.a \
+ ui/libui.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
- @PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ \
@SOCKET_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
@CORESERVICES_FRAMEWORKS@ \
+ @PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
# Libraries and plugin flags with which to link rawshark.
rawshark_LDADD = \
+ ui/libui.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
- @PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ \
@SOCKET_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
@CORESERVICES_FRAMEWORKS@ \
+ @PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
# Libraries and plugin flags with which to link dftest.
dftest_LDADD = \
+ ui/libui.a \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
epan/libwireshark.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
- @PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ \
@SOCKET_LIBS@ \
@C_ARES_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
+ @PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
rm -f $@ $@.tmp
$(editsh) $< > $@.tmp && chmod +x $@.tmp && mv $@.tmp $@
-#
-# Build "tshark-tap-register.c", which contains a function
-# "register_all_tap_listeners()"
-# that calls the register routines for all tshark tap listeners.
-#
-# We do this by grepping through sources.
-#
-# Formatting conventions: The name of the tap_listener_register_*
-# routines must start in column zero, or must be preceded only by
-# "void " starting in column zero, and must not be inside #if.
-#
-# The first argument is the directory in which the source files live.
-# All subsequent arguments are the files to scan.
-#
-tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/tools/make-tapreg-dotc
- @echo Making tshark-tap-register.c
- @$(srcdir)/tools/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
-
ps.c: print.ps $(srcdir)/tools/rdps.py
$(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
services: tools/make-services.pl
$(PERL) $(srcdir)/tools/make-services.pl
-#
-# XXX - "svnversion.h" is distributed in the release tarball; should
-# we be deleting it with "make clean", or should we only do that with
-# "make maintainer-clean"?
-#
CLEANFILES = \
- svnversion.h \
- idl2wrs \
*~ \
vgcore.*
+#
+# We have to remove svnversion.h with "make distclean", as, otherwise,
+# "make distcheck" fails. We still need to make the tarballs work
+# even if you do "make distclean" and try to rebuild; that's a work in
+# progress.
#
# XXX - "ps.c" is distributed in the source tarballs; why is it in the
# list of files removed by "make distclean"? (It's deliberately
# included in that list.)
#
DISTCLEANFILES = \
- ps.c
+ ps.c \
+ svnversion.h
MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \
Makefile.in \
aclocal.m4 \
+ compile \
config.h.in \
configure \
depcomp \
install-sh \
ltmain.sh \
- missing
+ missing \
+ ylwrap
EXTRA_DIST = \
INSTALL.configure \
capture-wpcap.h \
capture_wpcap_packet.c \
capture_wpcap_packet.h \
- cfilters \
- colorfilters \
+ cfilters \
+ colorfilters \
config.h.win32 \
config.nmake \
debian/changelog \
debian/wireshark.manpages \
debian/wireshark.menu \
epan/dfilter/README.dfilter \
- dfilters \
+ dfilters \
doxygen.cfg.in \
dumpcap.c \
editcap.c \
image/toolbar/network_virtual_16.xpm \
image/toolbar/network_wired_16.png \
image/toolbar/network_wireless_16.png \
+ image/toolbar/pipe_16.png \
+ image/toolbar/remote_arrow_16.png \
+ image/toolbar/remote_globe_16.png \
+ image/toolbar/remote_sat_16.png \
image/toolbar/resize_columns_24.xpm \
image/toolbar/telephone_16.xpm \
image/toolbar/telephony_16.xpm \
image/wssplash-dev.xpm \
image/wssplash.xpm \
ipmap.html \
+ macosx-setup.sh \
+ macosx-support-lib-patches/glib-gconvert.patch \
+ macosx-support-lib-patches/glib-pkgconfig.patch \
+ macosx-support-lib-patches/gnutls-pkgconfig.patch \
make-version.pl \
manuf \
manuf.tmpl \
$(dtds_DATA) \
$(radius_DATA) \
$(tpncp_DATA) \
+ $(ui_DATA) \
+ $(uiqt_DATA) \
$(wimaxasncp_DATA) \
randpkt.c \
smi_modules \
wiretap/CMakeLists.txt \
README.cmake \
ConfigureChecks.cmake \
- cmake/modules/readme.txt \
- cmake/modules/FindLYNX.cmake \
- cmake/modules/FindYACC.cmake \
+ cmake/modules/CMakeInstallDirs.cmake \
+ cmake/modules/COPYING-CMAKE-SCRIPTS \
+ cmake/modules/CheckCLinkerFlag.cmake \
cmake/modules/FeatureSummary.cmake \
cmake/modules/FindADNS.cmake \
cmake/modules/FindCAP.cmake \
- cmake/modules/UseLemon.cmake \
- cmake/modules/FindPCRE.cmake \
- cmake/modules/FindZLIB.cmake \
- cmake/modules/FindPORTAUDIO.cmake \
- cmake/modules/FindPCAP.cmake \
- cmake/modules/FindSMI.cmake \
cmake/modules/FindCARES.cmake \
- cmake/modules/FindXSLTPROC.cmake \
- cmake/modules/FindSH.cmake \
- cmake/modules/FindGNUTLS.cmake \
+ cmake/modules/FindFOP.cmake \
cmake/modules/FindGCRYPT.cmake \
- cmake/modules/UseMakeDissectorReg.cmake \
- cmake/modules/FindLEX.cmake \
- cmake/modules/FindPYTHON.cmake \
- cmake/modules/FindLUA.cmake \
- cmake/modules/FindYAPP.cmake \
cmake/modules/FindGEOIP.cmake \
- cmake/modules/FindXMLLINT.cmake \
- cmake/modules/FindSED.cmake \
cmake/modules/FindGLIB2.cmake \
- cmake/modules/FindGMODULE2.cmake \
- cmake/modules/FindGTHREAD2.cmake \
- cmake/modules/FindHtmlViewer.cmake \
+ cmake/modules/FindGMODULE2.cmake \
+ cmake/modules/FindGNUTLS.cmake \
+ cmake/modules/FindGTHREAD2.cmake \
cmake/modules/FindGTK2.cmake \
- cmake/modules/FindFOP.cmake \
- cmake/modules/LICENSE.txt \
- cmake/modules/CMakeInstallDirs.cmake \
- cmake/modules/CheckCLinkerFlag.cmake \
- cmake/modules/COPYING-CMAKE-SCRIPTS \
- cmake/modules/UseMakeTapReg.cmake \
- cmake/modules/FindM.cmake \
+ cmake/modules/FindGTK3.cmake \
+ cmake/modules/FindHtmlViewer.cmake \
cmake/modules/FindKERBEROS.cmake \
+ cmake/modules/FindLEX.cmake \
+ cmake/modules/FindLUA.cmake \
+ cmake/modules/FindLYNX.cmake \
+ cmake/modules/FindM.cmake \
+ cmake/modules/FindPCAP.cmake \
cmake/modules/FindPOD.cmake \
- win32/Makefile.nmake \
- win32/file_dlg_win32.c \
- win32/file_dlg_win32.h \
- win32/print_win32.c \
- win32/print_win32.h \
+ cmake/modules/FindPORTAUDIO.cmake \
+ cmake/modules/FindPYTHON.cmake \
+ cmake/modules/FindSED.cmake \
+ cmake/modules/FindSH.cmake \
+ cmake/modules/FindSMI.cmake \
+ cmake/modules/FindXMLLINT.cmake \
+ cmake/modules/FindXSLTPROC.cmake \
+ cmake/modules/FindYACC.cmake \
+ cmake/modules/FindYAPP.cmake \
+ cmake/modules/FindZLIB.cmake \
+ cmake/modules/LICENSE.txt \
+ cmake/modules/UseLemon.cmake \
+ cmake/modules/UseMakeDissectorReg.cmake \
+ cmake/modules/UseMakeTapReg.cmake \
+ cmake/modules/readme.txt \
+ ui/win32/Makefile.nmake \
+ ui/win32/file_dlg_win32.c \
+ ui/win32/file_dlg_win32.h \
+ ui/win32/print_win32.c \
+ ui/win32/print_win32.h \
CPackConfig.txt \
- all.vcproj \
- dumpcap.vcproj \
- packaging.vcproj \
- tshark.vcproj \
+ all.vcproj \
+ dumpcap.vcproj \
+ packaging.vcproj \
+ tshark.vcproj \
wireshark.vcproj
install-exec-hook:
endif
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook
+DIST_SUBDIRS = asn1 codecs doc epan ui ui/cli ui/gtk help packaging plugins tools wiretap wsutil docbook
if HAVE_PLUGINS
-SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
+SUBDIRS = tools wsutil wiretap epan plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
else
-SUBDIRS = tools wsutil wiretap epan packaging help @wireshark_SUBDIRS@ . doc
+SUBDIRS = tools wsutil wiretap epan packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
endif
help/faq.txt: $(srcdir)/help/faq.py
checkapi_local:
$(PERL) tools/checkAPIs.pl \
- $(TSHARK_TAP_SRC)
-# $(wireshark_SOURCES)
+ $(TSHARK_TAP_SRC) \
+ $(wireshark_SOURCES)
# $(EXTRA_wireshark_SOURCES)
checkapi: checkapi_local
cd wiretap && $(MAKE) checkapi
- cd ../codecs && $(MAKE) checkapi
-## cd ../gtk && $(MAKE) checkapi
-## cd ../epan && $(MAKE) checkapi
-## cd ../epan/crypt && $(MAKE) checkapi
- cd ../dfilter && $(MAKE) checkapi
-## cd ../ftypes && $(MAKE) checkapi
-## cd ../wslua && $(MAKE) checkapi
- cd ../dissectors && $(MAKE) checkapi
- cd ../../plugins && $(MAKE) checkapi
- cd ../wsutil && $(MAKE) checkapi
+ cd codecs && $(MAKE) checkapi
+ cd ui && $(MAKE) checkapi
+ cd ui/gtk && $(MAKE) checkapi
+## cd epan && $(MAKE) checkapi
+## cd epan/crypt && $(MAKE) checkapi
+ cd epan/dfilter && $(MAKE) checkapi
+## cd epan/ftypes && $(MAKE) checkapi
+## cd epan/wslua && $(MAKE) checkapi
+ cd epan/dissectors && $(MAKE) checkapi
+ cd plugins && $(MAKE) checkapi
+ cd wsutil && $(MAKE) checkapi
git.samba.org / obnox / wireshark / wip.git / blobdiff