sync repository
[mardrone] / mardrone / Makefile
index aacec08..18c176f 100644 (file)
@@ -1,25 +1,25 @@
 #############################################################################
 # Makefile for building: mardrone
-# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Dec 22 12:21:11 2010
+# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Jan 25 14:08:11 2012
 # Project:  mardrone.pro
 # Template: app
-# Command: /usr/bin/qmake -o Makefile mardrone.pro
+# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile mardrone.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtDeclarative -I/targets/FREMANTLE_ARMEL/usr/include -I../../../../ARDrone_SDK_1_5_Version_20101004/ARDroneLib/Soft/Common -I../../../../ARDrone_SDK_1_5_Version_20101004/ARDroneLib/VP_SDK -I../../../../ARDrone_SDK_1_5_Version_20101004/ARDroneLib/VP_SDK/VP_Os/linux -I../../../../ARDrone_SDK_1_5_Version_20101004/ARDroneLib/VP_SDK/VP_Os -I../../../../ARDrone_SDK_1_5_Version_20101004/ARDroneLib/Soft/Lib -I../../../../ARDrone_SDK_1_5_Version_20101004/ARDroneLib/VLIB -I../../../../ARDrone_SDK_1_5_Version_20101004/ARDroneLib -I.
+DEFINES       = -DQT_WEBKIT -DHAVE_SDL -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtDeclarative -I/usr/include/qt4 -Idronelib -Igauges -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/Soft/Common -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK/VP_Os/linux -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK/VP_Os -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/Soft/Lib -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VLIB -IARDrone_SDK_Version_1_8_20110726/ARDroneLib -I.
 LINK          = g++
-LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu
-LIBS          = $(SUBLIBS)  -L/usr/lib -lQtComponents -L/home/kathy/ARDrone_SDK_1_5_Version_20101004/lib -lvlib -lsdk -lQtDeclarative -L/usr/lib -L/usr/X11R6/lib -lQtScript -lQtSvg -lQtSql -lQtXmlPatterns -lQtOpenGL -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
+LFLAGS        = -Wl,-O1
+LIBS          = $(SUBLIBS)  -L/usr/lib/i386-linux-gnu -lSDL -lQtDeclarative -lQtGui -lQtNetwork -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /usr/bin/qmake
+QMAKE         = /usr/bin/qmake-qt4
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
@@ -44,17 +44,23 @@ OBJECTS_DIR   = ./
 ####### Files
 
 SOURCES       = main.cpp \
-               dronecontrol.cpp \
-               navdata.cpp \
-               video.cpp \
-               gauge.cpp \
-               gaugelabel.cpp \
-               gaugehorizon.cpp moc_dronecontrol.cpp \
+               dronelib/dronecontrol.cpp \
+               dronelib/navdata.cpp \
+               dronelib/video.cpp \
+               gauges/gauge.cpp \
+               gauges/gaugelabel.cpp \
+               gauges/gaugetape.cpp \
+               gauges/gaugehorizon.cpp \
+               dronelib/joystick.cpp \
+               qdeclarativetoucharea.cpp moc_dronecontrol.cpp \
                moc_navdata.cpp \
                moc_video.cpp \
                moc_gauge.cpp \
                moc_gaugelabel.cpp \
+               moc_gaugetape.cpp \
                moc_gaugehorizon.cpp \
+               moc_joystick.cpp \
+               moc_qdeclarativetoucharea.cpp \
                qrc_ardrone.cpp
 OBJECTS       = main.o \
                dronecontrol.o \
@@ -62,33 +68,41 @@ OBJECTS       = main.o \
                video.o \
                gauge.o \
                gaugelabel.o \
+               gaugetape.o \
                gaugehorizon.o \
+               joystick.o \
+               qdeclarativetoucharea.o \
                moc_dronecontrol.o \
                moc_navdata.o \
                moc_video.o \
                moc_gauge.o \
                moc_gaugelabel.o \
+               moc_gaugetape.o \
                moc_gaugehorizon.o \
+               moc_joystick.o \
+               moc_qdeclarativetoucharea.o \
                qrc_ardrone.o
-DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
+               /usr/share/qt4/mkspecs/common/unix.conf \
+               /usr/share/qt4/mkspecs/common/linux.conf \
+               /usr/share/qt4/mkspecs/qconfig.pri \
+               /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
+               /usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /usr/share/qt4/mkspecs/features/qt_config.prf \
+               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /usr/share/qt4/mkspecs/features/default_pre.prf \
+               /usr/share/qt4/mkspecs/features/release.prf \
+               /usr/share/qt4/mkspecs/features/default_post.prf \
+               /usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
+               /usr/share/qt4/mkspecs/features/warn_on.prf \
+               /usr/share/qt4/mkspecs/features/qt.prf \
+               /usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /usr/share/qt4/mkspecs/features/moc.prf \
+               /usr/share/qt4/mkspecs/features/resources.prf \
+               /usr/share/qt4/mkspecs/features/uic.prf \
+               /usr/share/qt4/mkspecs/features/yacc.prf \
+               /usr/share/qt4/mkspecs/features/lex.prf \
+               /usr/share/qt4/mkspecs/features/include_source_dir.prf \
                mardrone.pro
 QMAKE_TARGET  = mardrone
 DESTDIR       = 
@@ -121,73 +135,63 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: mardrone.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
-               /usr/lib/libQtDeclarative.prl \
-               /usr/lib/libQtScript.prl \
-               /usr/lib/libQtCore.prl \
-               /usr/lib/libQtSvg.prl \
-               /usr/lib/libQtGui.prl \
-               /usr/lib/libQtDBus.prl \
-               /usr/lib/libQtXml.prl \
-               /usr/lib/libQtSql.prl \
-               /usr/lib/libQtXmlPatterns.prl \
-               /usr/lib/libQtNetwork.prl \
-               /usr/lib/libQtOpenGL.prl
-       $(QMAKE) -o Makefile mardrone.pro
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
-/usr/lib/libQtDeclarative.prl:
-/usr/lib/libQtScript.prl:
-/usr/lib/libQtCore.prl:
-/usr/lib/libQtSvg.prl:
-/usr/lib/libQtGui.prl:
-/usr/lib/libQtDBus.prl:
-/usr/lib/libQtXml.prl:
-/usr/lib/libQtSql.prl:
-/usr/lib/libQtXmlPatterns.prl:
-/usr/lib/libQtNetwork.prl:
-/usr/lib/libQtOpenGL.prl:
+Makefile: mardrone.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
+               /usr/share/qt4/mkspecs/common/unix.conf \
+               /usr/share/qt4/mkspecs/common/linux.conf \
+               /usr/share/qt4/mkspecs/qconfig.pri \
+               /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
+               /usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /usr/share/qt4/mkspecs/features/qt_config.prf \
+               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /usr/share/qt4/mkspecs/features/default_pre.prf \
+               /usr/share/qt4/mkspecs/features/release.prf \
+               /usr/share/qt4/mkspecs/features/default_post.prf \
+               /usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
+               /usr/share/qt4/mkspecs/features/warn_on.prf \
+               /usr/share/qt4/mkspecs/features/qt.prf \
+               /usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /usr/share/qt4/mkspecs/features/moc.prf \
+               /usr/share/qt4/mkspecs/features/resources.prf \
+               /usr/share/qt4/mkspecs/features/uic.prf \
+               /usr/share/qt4/mkspecs/features/yacc.prf \
+               /usr/share/qt4/mkspecs/features/lex.prf \
+               /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /usr/lib/i386-linux-gnu/libQtDeclarative.prl \
+               /usr/lib/i386-linux-gnu/libQtGui.prl \
+               /usr/lib/i386-linux-gnu/libQtNetwork.prl \
+               /usr/lib/i386-linux-gnu/libQtCore.prl
+       $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile mardrone.pro
+/usr/share/qt4/mkspecs/common/g++.conf:
+/usr/share/qt4/mkspecs/common/unix.conf:
+/usr/share/qt4/mkspecs/common/linux.conf:
+/usr/share/qt4/mkspecs/qconfig.pri:
+/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
+/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/usr/share/qt4/mkspecs/features/qt_config.prf:
+/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/usr/share/qt4/mkspecs/features/default_pre.prf:
+/usr/share/qt4/mkspecs/features/release.prf:
+/usr/share/qt4/mkspecs/features/default_post.prf:
+/usr/share/qt4/mkspecs/features/link_pkgconfig.prf:
+/usr/share/qt4/mkspecs/features/warn_on.prf:
+/usr/share/qt4/mkspecs/features/qt.prf:
+/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/usr/share/qt4/mkspecs/features/moc.prf:
+/usr/share/qt4/mkspecs/features/resources.prf:
+/usr/share/qt4/mkspecs/features/uic.prf:
+/usr/share/qt4/mkspecs/features/yacc.prf:
+/usr/share/qt4/mkspecs/features/lex.prf:
+/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib/i386-linux-gnu/libQtDeclarative.prl:
+/usr/lib/i386-linux-gnu/libQtGui.prl:
+/usr/lib/i386-linux-gnu/libQtNetwork.prl:
+/usr/lib/i386-linux-gnu/libQtCore.prl:
 qmake:  FORCE
-       @$(QMAKE) -o Makefile mardrone.pro
+       @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile mardrone.pro
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/mardrone1.0.0 || $(MKDIR) .tmp/mardrone1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents dronecontrol.h navdata.h video.h gauge.h gaugelabel.h gaugehorizon.h .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents ardrone.qrc .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents main.cpp dronecontrol.cpp navdata.cpp video.cpp gauge.cpp gaugelabel.cpp gaugehorizon.cpp .tmp/mardrone1.0.0/ && (cd `dirname .tmp/mardrone1.0.0` && $(TAR) mardrone1.0.0.tar mardrone1.0.0 && $(COMPRESS) mardrone1.0.0.tar) && $(MOVE) `dirname .tmp/mardrone1.0.0`/mardrone1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/mardrone1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents dronelib/dronecontrol.h dronelib/navdata.h dronelib/video.h gauges/gauge.h gauges/gaugelabel.h gauges/gaugetape.h gauges/gaugehorizon.h dronelib/joystick.h qdeclarativetoucharea.h .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents ardrone.qrc .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents main.cpp dronelib/dronecontrol.cpp dronelib/navdata.cpp dronelib/video.cpp gauges/gauge.cpp gauges/gaugelabel.cpp gauges/gaugetape.cpp gauges/gaugehorizon.cpp dronelib/joystick.cpp qdeclarativetoucharea.cpp .tmp/mardrone1.0.0/ && (cd `dirname .tmp/mardrone1.0.0` && $(TAR) mardrone1.0.0.tar mardrone1.0.0 && $(COMPRESS) mardrone1.0.0.tar) && $(MOVE) `dirname .tmp/mardrone1.0.0`/mardrone1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/mardrone1.0.0
 
 
 clean:compiler_clean 
@@ -208,42 +212,80 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_dronecontrol.cpp moc_navdata.cpp moc_video.cpp moc_gauge.cpp moc_gaugelabel.cpp moc_gaugehorizon.cpp
+compiler_moc_header_make_all: moc_dronecontrol.cpp moc_navdata.cpp moc_video.cpp moc_gauge.cpp moc_gaugelabel.cpp moc_gaugetape.cpp moc_gaugehorizon.cpp moc_joystick.cpp moc_qdeclarativetoucharea.cpp
 compiler_moc_header_clean:
-       -$(DEL_FILE) moc_dronecontrol.cpp moc_navdata.cpp moc_video.cpp moc_gauge.cpp moc_gaugelabel.cpp moc_gaugehorizon.cpp
-moc_dronecontrol.cpp: navdata.h \
-               dronecontrol.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) dronecontrol.h -o moc_dronecontrol.cpp
+       -$(DEL_FILE) moc_dronecontrol.cpp moc_navdata.cpp moc_video.cpp moc_gauge.cpp moc_gaugelabel.cpp moc_gaugetape.cpp moc_gaugehorizon.cpp moc_joystick.cpp moc_qdeclarativetoucharea.cpp
+moc_dronecontrol.cpp: dronelib/dronecontrol.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/dronecontrol.h -o moc_dronecontrol.cpp
 
-moc_navdata.cpp: navdata.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) navdata.h -o moc_navdata.cpp
+moc_navdata.cpp: dronelib/navdata.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/navdata.h -o moc_navdata.cpp
 
-moc_video.cpp: dronecontrol.h \
-               navdata.h \
-               video.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) video.h -o moc_video.cpp
+moc_video.cpp: dronelib/dronecontrol.h \
+               dronelib/video.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/video.h -o moc_video.cpp
 
-moc_gauge.cpp: gauge.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) gauge.h -o moc_gauge.cpp
+moc_gauge.cpp: gauges/gauge.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gauge.h -o moc_gauge.cpp
 
-moc_gaugelabel.cpp: gauge.h \
-               gaugelabel.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) gaugelabel.h -o moc_gaugelabel.cpp
+moc_gaugelabel.cpp: gauges/gauge.h \
+               gauges/gaugelabel.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gaugelabel.h -o moc_gaugelabel.cpp
 
-moc_gaugehorizon.cpp: gauge.h \
-               gaugehorizon.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) gaugehorizon.h -o moc_gaugehorizon.cpp
+moc_gaugetape.cpp: gauges/gauge.h \
+               gauges/gaugetape.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gaugetape.h -o moc_gaugetape.cpp
+
+moc_gaugehorizon.cpp: gauges/gauge.h \
+               gauges/gaugehorizon.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gaugehorizon.h -o moc_gaugehorizon.cpp
+
+moc_joystick.cpp: dronelib/joystick.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/joystick.h -o moc_joystick.cpp
+
+moc_qdeclarativetoucharea.cpp: qdeclarativetoucharea.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) qdeclarativetoucharea.h -o moc_qdeclarativetoucharea.cpp
 
 compiler_rcc_make_all: qrc_ardrone.cpp
 compiler_rcc_clean:
        -$(DEL_FILE) qrc_ardrone.cpp
 qrc_ardrone.cpp: ardrone.qrc \
+               gauges/ati1.png \
+               gauges/HeadingGauge.qml \
+               ConfigDialogDesktop.qml \
+               ardrone_harmattan.qml \
+               gauges/AltGauge.qml \
+               gear32x32.png \
+               gauges/EfisPFD.qml \
+               gauges/hdg2.png \
+               gauges/glareshield1.png \
                joyknob.png \
-               joybox.png \
+               CalibrateDialog.qml \
                BarGauge.qml \
+               gauges/ati6.png \
+               gauges/ati2.png \
+               gauges/needle2.png \
+               ardrone_symbian.qml \
+               JoyStickTouch.qml \
+               ConfigDialogSymbian.qml \
+               JoyStickCalibrator.qml \
+               CalibrateDialogDesktop.qml \
+               gauges/ati3.png \
+               gauges/needle1.png \
+               gauges/AttitudeGauge.qml \
+               JoyStickIndicator.qml \
+               joybox.png \
+               ardrone_desktop.qml \
+               gauges/ati4.png \
+               gauges/bezel.png \
+               gauges/alt2.png \
                ConfigDialog.qml \
-               ardrone.qml \
-               JoyStick.qml
+               gauges/hdg1.png \
+               gauges/ati5.png \
+               JoyStickCalibratorDesktop.qml \
+               gauges/EfisPFD.qml \
+               gauges/AltGauge.qml \
+               gauges/qmldir
        /usr/bin/rcc -name ardrone ardrone.qrc -o qrc_ardrone.cpp
 
 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -263,35 +305,40 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean
 
 ####### Compile
 
-main.o: main.cpp dronecontrol.h \
-               navdata.h \
-               video.h \
-               gaugehorizon.h \
-               gauge.h
+main.o: main.cpp qdeclarativetoucharea.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
 
-dronecontrol.o: dronecontrol.cpp dronecontrol.h \
-               navdata.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dronecontrol.o dronecontrol.cpp
+dronecontrol.o: dronelib/dronecontrol.cpp dronelib/dronecontrol.h \
+               dronelib/navdata.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dronecontrol.o dronelib/dronecontrol.cpp
+
+navdata.o: dronelib/navdata.cpp dronelib/navdata.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o navdata.o dronelib/navdata.cpp
+
+video.o: dronelib/video.cpp dronelib/video.h \
+               dronelib/dronecontrol.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o video.o dronelib/video.cpp
+
+gauge.o: gauges/gauge.cpp gauges/gauge.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gauge.o gauges/gauge.cpp
 
-navdata.o: navdata.cpp navdata.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o navdata.o navdata.cpp
+gaugelabel.o: gauges/gaugelabel.cpp gauges/gaugelabel.h \
+               gauges/gauge.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugelabel.o gauges/gaugelabel.cpp
 
-video.o: video.cpp video.h \
-               dronecontrol.h \
-               navdata.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o video.o video.cpp
+gaugetape.o: gauges/gaugetape.cpp gauges/gaugetape.h \
+               gauges/gauge.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugetape.o gauges/gaugetape.cpp
 
-gauge.o: gauge.cpp gauge.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gauge.o gauge.cpp
+gaugehorizon.o: gauges/gaugehorizon.cpp gauges/gaugehorizon.h \
+               gauges/gauge.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugehorizon.o gauges/gaugehorizon.cpp
 
-gaugelabel.o: gaugelabel.cpp gaugelabel.h \
-               gauge.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugelabel.o gaugelabel.cpp
+joystick.o: dronelib/joystick.cpp dronelib/joystick.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o joystick.o dronelib/joystick.cpp
 
-gaugehorizon.o: gaugehorizon.cpp gaugehorizon.h \
-               gauge.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugehorizon.o gaugehorizon.cpp
+qdeclarativetoucharea.o: qdeclarativetoucharea.cpp qdeclarativetoucharea.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qdeclarativetoucharea.o qdeclarativetoucharea.cpp
 
 moc_dronecontrol.o: moc_dronecontrol.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dronecontrol.o moc_dronecontrol.cpp
@@ -308,27 +355,46 @@ moc_gauge.o: moc_gauge.cpp
 moc_gaugelabel.o: moc_gaugelabel.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_gaugelabel.o moc_gaugelabel.cpp
 
+moc_gaugetape.o: moc_gaugetape.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_gaugetape.o moc_gaugetape.cpp
+
 moc_gaugehorizon.o: moc_gaugehorizon.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_gaugehorizon.o moc_gaugehorizon.cpp
 
+moc_joystick.o: moc_joystick.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_joystick.o moc_joystick.cpp
+
+moc_qdeclarativetoucharea.o: moc_qdeclarativetoucharea.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_qdeclarativetoucharea.o moc_qdeclarativetoucharea.cpp
+
 qrc_ardrone.o: qrc_ardrone.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_ardrone.o qrc_ardrone.cpp
 
 ####### Install
 
 install_target: first FORCE
-       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/usr/bin/ || $(MKDIR) $(INSTALL_ROOT)/opt/usr/bin/ 
-       -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/opt/usr/bin/$(QMAKE_TARGET)"
-       -$(STRIP) "$(INSTALL_ROOT)/opt/usr/bin/$(QMAKE_TARGET)"
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/ 
+       -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
+       -$(STRIP) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
 
 uninstall_target:  FORCE
-       -$(DEL_FILE) "$(INSTALL_ROOT)/opt/usr/bin/$(QMAKE_TARGET)"
-       -$(DEL_DIR) $(INSTALL_ROOT)/opt/usr/bin/ 
+       -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
+       -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/ 
+
+
+install_desktopfile: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/ 
+       -$(INSTALL_FILE) /mnt/hgfs/scratchbox/harmattan/mardrone/mardrone/mardrone.desktop $(INSTALL_ROOT)/usr/share/applications/
+
+
+uninstall_desktopfile:  FORCE
+       -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/applications/mardrone.desktop
+       -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/applications/ 
 
 
-install:  install_target  FORCE
+install:  install_target install_desktopfile  FORCE
 
-uninstall: uninstall_target   FORCE
+uninstall: uninstall_target uninstall_desktopfile   FORCE
 
 FORCE: