mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Ensure that uic is always run before any C++ source is compiled
It's very, very hard to scan for dependencies with a plain make. So let's give up and simply enforce that all *.ui files need to be processed before a *.cpp gets compiled. This introduces the make target "uicables" (similar to the "mocables" target that qmake produces) that will compile all .ui files. This target is now a dependency of all .cpp builds. In addition, tell make where to find .ui files and their corresponding ui_*.h files. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
b3b729e629
commit
bd1f8b580b
2 changed files with 27 additions and 13 deletions
13
Makefile
13
Makefile
|
|
@ -107,6 +107,18 @@ SOURCES = \
|
|||
main.cpp \
|
||||
$(RESFILE)
|
||||
|
||||
FORMS = \
|
||||
qt-ui/about.ui \
|
||||
qt-ui/divecomputermanagementdialog.ui \
|
||||
qt-ui/diveplanner.ui \
|
||||
qt-ui/downloadfromdivecomputer.ui \
|
||||
qt-ui/maintab.ui \
|
||||
qt-ui/mainwindow.ui \
|
||||
qt-ui/preferences.ui \
|
||||
qt-ui/printoptions.ui \
|
||||
qt-ui/renumber.ui \
|
||||
qt-ui/subsurfacewebservices.ui \
|
||||
qt-ui/tableview.ui
|
||||
|
||||
RESOURCES = $(NAME).qrc
|
||||
|
||||
|
|
@ -155,7 +167,6 @@ MSGLANGS=$(notdir $(wildcard po/*.po))
|
|||
# Add files to the following variables if the auto-detection based on the
|
||||
# filename fails
|
||||
OBJS_NEEDING_MOC =
|
||||
OBJS_NEEDING_UIC =
|
||||
HEADERS_NEEDING_MOC =
|
||||
|
||||
include Rules.mk
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue