Better fix for the compile problems

Still don't like the order dependency - but at least this seems to work
and correctly build after make confclean.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-10-03 13:21:36 -07:00
parent 65b49edf8a
commit 7a368ab06b
3 changed files with 7 additions and 8 deletions

View file

@ -68,7 +68,6 @@ SOURCES = \
equipment.c \
file.c \
info.c \
main.cpp \
parse-xml.c \
planner.c \
subsurfacestartup.c \
@ -80,10 +79,9 @@ SOURCES = \
uemis.c \
uemis-downloader.c \
libdivecomputer.c \
qt-gui.cpp \
qthelper.cpp \
qt-ui/divelistview.cpp \
qt-ui/maintab.cpp \
qt-ui/simplewidgets.cpp \
qt-ui/tableview.cpp \
qt-ui/mainwindow.cpp \
qt-ui/models.cpp \
qt-ui/plotareascene.cpp \
@ -94,17 +92,19 @@ SOURCES = \
qt-ui/kmessagewidget.cpp \
qt-ui/downloadfromdivecomputer.cpp \
qt-ui/preferences.cpp \
qt-ui/simplewidgets.cpp \
qt-ui/subsurfacewebservices.cpp \
qt-ui/divecomputermanagementdialog.cpp \
qt-ui/diveplanner.cpp \
qt-ui/divelistview.cpp \
qt-ui/about.cpp \
qt-ui/graphicsview-common.cpp \
qt-ui/printdialog.cpp \
qt-ui/printoptions.cpp \
qt-ui/printlayout.cpp \
qt-ui/completionmodels.cpp \
qt-ui/tableview.cpp \
qt-ui/maintab.cpp \
qt-gui.cpp \
main.cpp \
$(RESFILE)

View file

@ -11,7 +11,6 @@
#include "subsurfacestartup.h"
#include "qt-ui/mainwindow.h"
#include "qt-ui/diveplanner.h"
#include "qt-ui/ui_tableview.h"
#include <QStringList>

View file

@ -7,7 +7,7 @@ class QAbstractButton;
#include <QWidget>
#include <QDialog>
#include "ui_renumber.h"
#include "qt-ui/ui_renumber.h"
class MinMaxAvgWidget : public QWidget{
Q_OBJECT