From bd1f8b580bb2893ff52c7f5150c0565ae2fe89dc Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 3 Oct 2013 15:38:50 -0700 Subject: 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 Signed-off-by: Dirk Hohndel --- Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Makefile') 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 -- cgit v1.2.3-70-g09d2