forked from osmocom/wireshark
autotools: Generate Qt Resource Compiler source in /ui/qt dir
Change-Id: I0acdc1ea4d2110111a5506104e5075962f580bd5 Reviewed-on: https://code.wireshark.org/review/14438 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
parent
e7a24dc484
commit
0ebb4912f9
|
@ -179,7 +179,6 @@ wsar_html.zip
|
||||||
# Qt #
|
# Qt #
|
||||||
######
|
######
|
||||||
qtshark
|
qtshark
|
||||||
*.rcc.cpp
|
|
||||||
/ui/qt/__/
|
/ui/qt/__/
|
||||||
/ui/qt/*.qrc.depends
|
/ui/qt/*.qrc.depends
|
||||||
/ui/qt/*.pro.user
|
/ui/qt/*.pro.user
|
||||||
|
@ -187,6 +186,7 @@ qtshark
|
||||||
/ui/qt/moc_*.cpp
|
/ui/qt/moc_*.cpp
|
||||||
/ui/qt/moc_*.cpp_parameters
|
/ui/qt/moc_*.cpp_parameters
|
||||||
/ui/qt/*.moc.cpp
|
/ui/qt/*.moc.cpp
|
||||||
|
/ui/qt/*.rcc.cpp
|
||||||
/ui/qt/moc_*.cxx
|
/ui/qt/moc_*.cxx
|
||||||
/ui/qt/qrc_*.cpp
|
/ui/qt/qrc_*.cpp
|
||||||
/ui/qt/qrc_*.cxx
|
/ui/qt/qrc_*.cxx
|
||||||
|
|
|
@ -31,7 +31,7 @@ CLEANFILES = \
|
||||||
wireshark-tap-register.c-tmp \
|
wireshark-tap-register.c-tmp \
|
||||||
wireshark-tap-register-cache.pkl \
|
wireshark-tap-register-cache.pkl \
|
||||||
*.moc.cpp \
|
*.moc.cpp \
|
||||||
*.rrc.cpp \
|
qrc_*.cpp \
|
||||||
ui_*.h
|
ui_*.h
|
||||||
*~
|
*~
|
||||||
|
|
||||||
|
@ -93,21 +93,36 @@ am__v_UIC_0 = @echo " UIC " $@;
|
||||||
# building .rcc.cpp files from .qrc files by running rcc,
|
# building .rcc.cpp files from .qrc files by running rcc,
|
||||||
# and building ui_XXX.h files from .ui files by running uic.
|
# and building ui_XXX.h files from .ui files by running uic.
|
||||||
#
|
#
|
||||||
SUFFIXES = .moc.cpp .qrc .rcc.cpp
|
SUFFIXES = .moc.cpp
|
||||||
|
|
||||||
.h.moc.cpp:
|
|
||||||
$(AM_V_MOC)$(MOC) $(MOC_OPTIONS) -I.. -I../.. -o $@ $<
|
|
||||||
|
|
||||||
.qrc.rcc.cpp:
|
|
||||||
$(MKDIR_P) $(@D)
|
|
||||||
$(AM_V_RCC)$(RCC) -name `basename $< .qrc` -o $@ $<
|
|
||||||
|
|
||||||
ui_%.h: %.ui
|
|
||||||
$(AM_V_UIC)$(UIC) $< -o $@
|
|
||||||
|
|
||||||
|
#
|
||||||
# The Qt toolchain uses the naming convention moc_FOO.cpp. Should we do the same?
|
# The Qt toolchain uses the naming convention moc_FOO.cpp. Should we do the same?
|
||||||
#moc_%.cpp: %.h
|
#moc_%.cpp: %.h
|
||||||
# $(MOC) $< -o $@
|
# $(MOC) $< -o $@
|
||||||
|
#
|
||||||
|
.h.moc.cpp:
|
||||||
|
$(AM_V_MOC)$(MOC) $(MOC_OPTIONS) -I.. -I../.. -o $@ $<
|
||||||
|
|
||||||
|
qrc_about.cpp: ../../image/about.qrc
|
||||||
|
$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name about -o $@ $<
|
||||||
|
|
||||||
|
qrc_layout.cpp: ../../image/layout.qrc
|
||||||
|
$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name layout -o $@ $<
|
||||||
|
|
||||||
|
qrc_languages.cpp: ../../image/languages/languages.qrc
|
||||||
|
$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name languages -o $@ $<
|
||||||
|
|
||||||
|
qrc_i18n.cpp: i18n.qrc
|
||||||
|
$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name i18n -o $@ $<
|
||||||
|
|
||||||
|
qrc_toolbar.cpp: ../../image/toolbar.qrc
|
||||||
|
$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name toolbar -o $@ $<
|
||||||
|
|
||||||
|
qrc_wsicon.cpp: ../../image/wsicon.qrc
|
||||||
|
$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) --name wsicon -o $@ $<
|
||||||
|
|
||||||
|
ui_%.h: %.ui
|
||||||
|
$(AM_V_UIC)$(UIC) $< -o $@
|
||||||
|
|
||||||
#
|
#
|
||||||
# Explicit dependencies to force the ui_ headers to be built.
|
# Explicit dependencies to force the ui_ headers to be built.
|
||||||
|
|
|
@ -382,6 +382,20 @@ QRC_FILES = \
|
||||||
../../image/wsicon.qrc \
|
../../image/wsicon.qrc \
|
||||||
i18n.qrc
|
i18n.qrc
|
||||||
|
|
||||||
|
#
|
||||||
|
# The .cpp files generated from them.
|
||||||
|
# We do *not* include these in the distribution; if you have the Qt SDK
|
||||||
|
# installed, so that you can build Qt-based applications, you have rcc
|
||||||
|
# installed.
|
||||||
|
#
|
||||||
|
QRC_SRC = \
|
||||||
|
qrc_about.cpp \
|
||||||
|
qrc_languages.cpp \
|
||||||
|
qrc_layout.cpp \
|
||||||
|
qrc_toolbar.cpp \
|
||||||
|
qrc_wsicon.cpp \
|
||||||
|
qrc_i18n.cpp
|
||||||
|
|
||||||
#
|
#
|
||||||
# .ts files.
|
# .ts files.
|
||||||
# wireshark_en should be pluralonly.
|
# wireshark_en should be pluralonly.
|
||||||
|
@ -401,14 +415,6 @@ TS_FILES = \
|
||||||
# Should they be auto-generated ?
|
# Should they be auto-generated ?
|
||||||
QM_FILES = $(TS_FILES:.ts=.qm)
|
QM_FILES = $(TS_FILES:.ts=.qm)
|
||||||
|
|
||||||
#
|
|
||||||
# The .rcc.cpp files generated from them.
|
|
||||||
# We do *not* include these in the distribution; if you have the Qt SDK
|
|
||||||
# installed, so that you can build Qt-based applications, you have moc
|
|
||||||
# installed.
|
|
||||||
#
|
|
||||||
QRC_SRC = $(QRC_FILES:.qrc=.rcc.cpp)
|
|
||||||
|
|
||||||
WIRESHARK_QT_SRC = \
|
WIRESHARK_QT_SRC = \
|
||||||
about_dialog.cpp \
|
about_dialog.cpp \
|
||||||
accordion_frame.cpp \
|
accordion_frame.cpp \
|
||||||
|
|
Loading…
Reference in New Issue