summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Thiago Macieira <thiago@macieira.org>2013-10-03 15:38:50 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-03 15:45:09 -0700
commitbd1f8b580bb2893ff52c7f5150c0565ae2fe89dc (patch)
tree207f0e6f8bc0250c1cbf2a32968bb0840be2d72c /Makefile
parentb3b729e6299d9da489f99ccc82b1ccfbd9b7724c (diff)
downloadsubsurface-bd1f8b580bb2893ff52c7f5150c0565ae2fe89dc.tar.gz
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1e193eb22..29466925a 100644
--- a/Makefile
+++ b/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