@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).
#
uidir = $(pkgdatadir)/ui
ui_DATA = \
- gtk/ui/main-menubar-ui.xml
+ 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/libui.a \
+ ui/gtk/libui_dirty.a \
codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
- @SSL_LIBS@ \
+ @SSL_LIBS@ \
$(plugin_ldadd) \
@PCAP_LIBS@ \
@GTK_LIBS@ -lm \
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) \
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 \
$(radius_DATA) \
$(tpncp_DATA) \
$(ui_DATA) \
+ $(uiqt_DATA) \
$(wimaxasncp_DATA) \
randpkt.c \
smi_modules \
cmake/modules/UseMakeDissectorReg.cmake \
cmake/modules/UseMakeTapReg.cmake \
cmake/modules/readme.txt \
- win32/Makefile.nmake \
- win32/file_dlg_win32.c \
- win32/file_dlg_win32.h \
- win32/print_win32.c \
- win32/print_win32.h \
+ 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 \
endif
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook
+DIST_SUBDIRS = asn1 codecs doc epan ui/gtk help packaging plugins tools wiretap wsutil docbook
if HAVE_PLUGINS
SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
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
-
-# When we build a release tarball, tell make-version that it is such. This
-# prevents make-version from looking for SVN details in the source tarball,
-# failing, and then labelling the build as from "SVN version unknown."
-dist-hook:
- if test -f $(top_srcdir)/version.conf -a ! -f $(top_distdir)/version.conf ; then \
- cp $(top_srcdir)/version.conf $(top_distdir); \
- if grep "^is_release: *1" $(top_distdir)/version.conf ; then :; \
- else \
- echo "is_release: 1" >> $(top_distdir)/version.conf; \
- fi ; \
- fi
+ cd codecs && $(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