summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Thiago Macieira <thiago@macieira.org>2013-04-13 09:19:03 -0700
committerGravatar Thiago Macieira <thiago@macieira.org>2013-04-23 00:06:32 -0700
commitc8b360c3b5fdeb9f878cb5db648a121a10e33772 (patch)
tree351d72dc5af33d1f6885cbce4120a1e9e6dad813
parentb1c9ed76dcae007e500da286dbfaa421d33b6d45 (diff)
downloadsubsurface-c8b360c3b5fdeb9f878cb5db648a121a10e33772.tar.gz
Add a HEADERS variable to the Makefile
Similar to the qmake variable of the same name, this lists (at least) the headers that may need moc to be run on. Adding more headers is not a problem. Signed-off-by: Thiago Macieira <thiago@macieira.org>
-rw-r--r--Makefile10
-rw-r--r--Rules.mk2
2 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3308c9f41..41e5f093b 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,16 @@ EXTRA_FLAGS = $(QTCXXFLAGS) $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
$(LIBDIVECOMPUTERCFLAGS) \
$(LIBSOUPCFLAGS) $(GCONF2CFLAGS)
+HEADERS = \
+ qt-ui/addcylinderdialog.h \
+ qt-ui/divelistview.h \
+ qt-ui/maintab.h \
+ qt-ui/mainwindow.h \
+ qt-ui/models.h \
+ qt-ui/plotareascene.h \
+ qt-ui/starwidget.h \
+
+
QTOBJS = qt-ui/maintab.o qt-ui/mainwindow.o qt-ui/plotareascene.o qt-ui/divelistview.o \
qt-ui/addcylinderdialog.o qt-ui/models.o qt-ui/starwidget.o
diff --git a/Rules.mk b/Rules.mk
index 5374e060b..8ffb88b86 100644
--- a/Rules.mk
+++ b/Rules.mk
@@ -20,7 +20,7 @@ PRODVERSION_STRING := $(shell $(GET_VERSION) win $(VERSION_STRING) || \
MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo))
# Add the objects for the header files which define QObject subclasses
-HEADERS_NEEDING_MOC += $(shell grep -l -s 'Q_OBJECT' $(OBJS:.o=.h))
+HEADERS_NEEDING_MOC += $(shell grep -l -s 'Q_OBJECT' $(HEADERS))
MOC_OBJS = $(HEADERS_NEEDING_MOC:.h=.moc.o)
ALL_OBJS = $(OBJS) $(MOC_OBJS)