It might help for the Qt version of Wireshark to link against the Qt
libraries and to have a main() function. Replace some manual Makefile rules with an implicit rule. svn path=/trunk/; revision=46875
This commit is contained in:
Gerald Combs
parent
c2a63d4c36
commit
b6382033e1
|
|
@ -360,6 +360,7 @@ wireshark_LDADD = \
|
|||
@LIBSMI_LDFLAGS@ \
|
||||
@PORTAUDIO_LIBS@ \
|
||||
@GTK_LIBS@ \
|
||||
@Qt_LIBS@ \
|
||||
@GLIB_LIBS@ \
|
||||
-lm
|
||||
|
||||
|
|
|
|||
|
|
@ -76,70 +76,74 @@ SUFFIXES = .moc.cpp .qrc .rcc.cpp
|
|||
.qrc.rcc.cpp:
|
||||
rcc -name `basename $< .qrc` -o $@ $<
|
||||
|
||||
export_object_dialog.cpp export_object_dialog.h: ui_export_object_dialog.h
|
||||
|
||||
ui_export_object_dialog.h: export_object_dialog.ui
|
||||
ui_%.h: %.ui
|
||||
uic $< -o $@
|
||||
|
||||
# The Qt toolchain uses the naming convention moc_FOO.cpp. Should we do the same?
|
||||
#moc_%.cpp: %.h
|
||||
# moc $< -o $@
|
||||
|
||||
export_object_dialog.cpp export_object_dialog.h: ui_export_object_dialog.h
|
||||
|
||||
file_set_dialog.cpp file_set_dialog.h: ui_file_set_dialog.h
|
||||
|
||||
ui_file_set_dialog.h: file_set_dialog.ui
|
||||
uic $< -o $@
|
||||
#ui_file_set_dialog.h: file_set_dialog.ui
|
||||
# uic $< -o $@
|
||||
|
||||
import_text_dialog.cpp import_text_dialog.h: ui_import_text_dialog.h
|
||||
|
||||
ui_import_text_dialog.h: import_text_dialog.ui
|
||||
uic $< -o $@
|
||||
#ui_import_text_dialog.h: import_text_dialog.ui
|
||||
# uic $< -o $@
|
||||
|
||||
main_welcome.cpp main_welcome.h: ui_main_welcome.h
|
||||
|
||||
ui_main_welcome.h: main_welcome.ui
|
||||
uic $< -o $@
|
||||
#ui_main_welcome.h: main_welcome.ui
|
||||
# uic $< -o $@
|
||||
|
||||
main_window.cpp main_window.h: ui_main_window.h
|
||||
|
||||
ui_main_window.h: main_window.ui
|
||||
uic $< -o $@
|
||||
#ui_main_window.h: main_window.ui
|
||||
# uic $< -o $@
|
||||
|
||||
packet_comment_dialog.cpp packet_comment_dialog.h: ui_packet_comment_dialog.h
|
||||
|
||||
ui_packet_comment_dialog.h: packet_comment_dialog.ui
|
||||
uic $< -o $@
|
||||
#ui_packet_comment_dialog.h: packet_comment_dialog.ui
|
||||
# uic $< -o $@
|
||||
|
||||
packet_format_group_box.cpp packet_format_group_box.h: ui_packet_format_group_box.h
|
||||
|
||||
ui_packet_format_group_box.h: packet_format_group_box.ui
|
||||
uic $< -o $@
|
||||
#ui_packet_format_group_box.h: packet_format_group_box.ui
|
||||
# uic $< -o $@
|
||||
|
||||
packet_range_group_box.cpp packet_range_group_box.h: ui_packet_range_group_box.h
|
||||
|
||||
ui_packet_range_group_box.h: packet_range_group_box.ui
|
||||
uic $< -o $@
|
||||
#ui_packet_range_group_box.h: packet_range_group_box.ui
|
||||
# uic $< -o $@
|
||||
|
||||
print_dialog.cpp print_dialog.h: ui_print_dialog.h
|
||||
|
||||
ui_print_dialog.h: print_dialog.ui
|
||||
uic $< -o $@
|
||||
#ui_print_dialog.h: print_dialog.ui
|
||||
# uic $< -o $@
|
||||
|
||||
profile_dialog.cpp profile_dialog.h: ui_profile_dialog.h
|
||||
|
||||
ui_profile_dialog.h: profile_dialog.ui
|
||||
uic $< -o $@
|
||||
#ui_profile_dialog.h: profile_dialog.ui
|
||||
# uic $< -o $@
|
||||
|
||||
search_frame.cpp search_frame.h: ui_search_frame.h
|
||||
|
||||
ui_search_frame.h: search_frame.ui
|
||||
uic $< -o $@
|
||||
#ui_search_frame.h: search_frame.ui
|
||||
# uic $< -o $@
|
||||
|
||||
splash_overlay.cpp splash_overlay.h: ui_splash_overlay.h
|
||||
|
||||
ui_splash_overlay.h: splash_overlay.ui
|
||||
uic $< -o $@
|
||||
#ui_splash_overlay.h: splash_overlay.ui
|
||||
# uic $< -o $@
|
||||
|
||||
time_shift_dialog.cpp time_shift_dialog.h: ui_time_shift_dialog.h
|
||||
|
||||
ui_time_shift_dialog.h: time_shift_dialog.ui
|
||||
uic $< -o $@
|
||||
#ui_time_shift_dialog.h: time_shift_dialog.ui
|
||||
# uic $< -o $@
|
||||
|
||||
doxygen:
|
||||
if HAVE_DOXYGEN
|
||||
|
|
|
|||
|
|
@ -91,8 +91,8 @@ MOC_HDRS = \
|
|||
export_dissection_dialog.h \
|
||||
export_object_dialog.h \
|
||||
file_set_dialog.h \
|
||||
interface_tree.h \
|
||||
import_text_dialog.h \
|
||||
interface_tree.h \
|
||||
label_stack.h \
|
||||
main_status_bar.h \
|
||||
main_welcome.h \
|
||||
|
|
@ -108,9 +108,9 @@ MOC_HDRS = \
|
|||
progress_bar.h \
|
||||
proto_tree.h \
|
||||
recent_file_status.h \
|
||||
search_frame.h \
|
||||
simple_dialog_qt.h \
|
||||
sparkline_delegate.h \
|
||||
search_frame.h \
|
||||
splash_overlay.h \
|
||||
syntax_line_edit.h \
|
||||
time_shift_dialog.h \
|
||||
|
|
@ -172,9 +172,10 @@ WIRESHARK_QT_SRC = \
|
|||
export_dissection_dialog.cpp \
|
||||
export_object_dialog.cpp \
|
||||
file_set_dialog.cpp \
|
||||
interface_tree.cpp \
|
||||
import_text_dialog.cpp \
|
||||
interface_tree.cpp \
|
||||
label_stack.cpp \
|
||||
main.cpp \
|
||||
main_status_bar.cpp \
|
||||
main_welcome.cpp \
|
||||
main_window.cpp \
|
||||
|
|
@ -192,9 +193,9 @@ WIRESHARK_QT_SRC = \
|
|||
proto_tree.cpp \
|
||||
qt_ui_utils.cpp \
|
||||
recent_file_status.cpp \
|
||||
search_frame.cpp \
|
||||
simple_dialog_qt.cpp \
|
||||
sparkline_delegate.cpp \
|
||||
search_frame.cpp \
|
||||
splash_overlay.cpp \
|
||||
syntax_line_edit.cpp \
|
||||
time_shift_dialog.cpp \
|
||||
|
|
|
|||
Loading…
Reference in New Issue