Cync
[mardrone] / mardrone / Makefile
index 18c176f..55d71cf 100644 (file)
@@ -1,41 +1,42 @@
 #############################################################################
-# Makefile for building: mardrone
-# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Jan 25 14:08:11 2012
+# Makefile for building: mardrone.app/Contents/MacOS/mardrone
+# Generated by qmake (2.01a) (Qt 4.8.0) on: Tue May 8 18:18:49 2012
 # Project:  mardrone.pro
 # Template: app
-# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile mardrone.pro
+# Command: /usr/bin/qmake -spec /usr/local/Qt4.8/mkspecs/macx-g++ CONFIG+=declarative_debug -o Makefile mardrone.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
 CC            = gcc
 CXX           = g++
-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.
+DEFINES       = -DHAVE_SDL -DQT_DECLARATIVE_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -g -gdwarf-2 -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5 -Wall -W $(DEFINES)
+CXXFLAGS      = -pipe -g -gdwarf-2 -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5 -Wall -W $(DEFINES)
+INCPATH       = -I/usr/local/Qt4.8/mkspecs/macx-g++ -I. -I/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/usr/include/QtCore -I/Library/Frameworks/QtNetwork.framework/Versions/4/Headers -I/usr/include/QtNetwork -I/Library/Frameworks/QtGui.framework/Versions/4/Headers -I/usr/include/QtGui -I/Library/Frameworks/QtDeclarative.framework/Versions/4/Headers -I/usr/include/QtDeclarative -I/usr/include -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. -F/Library/Frameworks
 LINK          = g++
-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-qt4
+LFLAGS        = -headerpad_max_install_names -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
+LIBS          = $(SUBLIBS) -F/Library/Frameworks -L/Library/Frameworks -L../mardrone/ardrone-lib-osx -lvlib -framework SDL -framework QtDeclarative -framework QtScript -framework QtCore -framework QtSvg -framework QtGui -framework QtSql -framework QtXmlPatterns -framework QtNetwork 
+AR            = ar cq
+RANLIB        = ranlib -s
+QMAKE         = /usr/bin/qmake
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
 SED           = sed
-COPY_FILE     = $(COPY)
-COPY_DIR      = $(COPY) -r
-STRIP         = strip
-INSTALL_FILE  = install -m 644 -p
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+STRIP         = 
+INSTALL_FILE  = $(COPY_FILE)
 INSTALL_DIR   = $(COPY_DIR)
-INSTALL_PROGRAM = install -m 755 -p
+INSTALL_PROGRAM = $(COPY_FILE)
 DEL_FILE      = rm -f
 SYMLINK       = ln -f -s
 DEL_DIR       = rmdir
 MOVE          = mv -f
 CHK_DIR_EXISTS= test -d
 MKDIR         = mkdir -p
+export MACOSX_DEPLOYMENT_TARGET = 10.4
 
 ####### Output directory
 
@@ -52,7 +53,10 @@ SOURCES       = main.cpp \
                gauges/gaugetape.cpp \
                gauges/gaugehorizon.cpp \
                dronelib/joystick.cpp \
-               qdeclarativetoucharea.cpp moc_dronecontrol.cpp \
+               qdeclarativetoucharea.cpp \
+               gauges/gaugearc.cpp \
+               uilistelement.cpp \
+               gauges/gaugehsi.cpp moc_dronecontrol.cpp \
                moc_navdata.cpp \
                moc_video.cpp \
                moc_gauge.cpp \
@@ -61,6 +65,9 @@ SOURCES       = main.cpp \
                moc_gaugehorizon.cpp \
                moc_joystick.cpp \
                moc_qdeclarativetoucharea.cpp \
+               moc_gaugearc.cpp \
+               moc_uilistelement.cpp \
+               moc_gaugehsi.cpp \
                qrc_ardrone.cpp
 OBJECTS       = main.o \
                dronecontrol.o \
@@ -72,6 +79,9 @@ OBJECTS       = main.o \
                gaugehorizon.o \
                joystick.o \
                qdeclarativetoucharea.o \
+               gaugearc.o \
+               uilistelement.o \
+               gaugehsi.o \
                moc_dronecontrol.o \
                moc_navdata.o \
                moc_video.o \
@@ -81,32 +91,58 @@ OBJECTS       = main.o \
                moc_gaugehorizon.o \
                moc_joystick.o \
                moc_qdeclarativetoucharea.o \
+               moc_gaugearc.o \
+               moc_uilistelement.o \
+               moc_gaugehsi.o \
                qrc_ardrone.o
-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 \
+DIST          = /usr/local/Qt4.8/mkspecs/common/unix.conf \
+               /usr/local/Qt4.8/mkspecs/common/mac.conf \
+               /usr/local/Qt4.8/mkspecs/common/gcc-base.conf \
+               /usr/local/Qt4.8/mkspecs/common/gcc-base-macx.conf \
+               /usr/local/Qt4.8/mkspecs/common/g++-base.conf \
+               /usr/local/Qt4.8/mkspecs/common/g++-macx.conf \
+               /usr/local/Qt4.8/mkspecs/qconfig.pri \
+               /usr/local/Qt4.8/mkspecs/modules/qt_webkit_version.pri \
+               /usr/local/Qt4.8/mkspecs/features/qt_functions.prf \
+               /usr/local/Qt4.8/mkspecs/features/qt_config.prf \
+               /usr/local/Qt4.8/mkspecs/features/exclusive_builds.prf \
+               /usr/local/Qt4.8/mkspecs/features/default_pre.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/default_pre.prf \
+               deploy.pri \
+               /usr/local/Qt4.8/mkspecs/features/mac/dwarf2.prf \
+               /usr/local/Qt4.8/mkspecs/features/debug.prf \
+               /usr/local/Qt4.8/mkspecs/features/default_post.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/default_post.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/x86_64.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/objective_c.prf \
+               /usr/local/Qt4.8/mkspecs/features/link_pkgconfig.prf \
+               /usr/local/Qt4.8/mkspecs/features/declarative_debug.prf \
+               /usr/local/Qt4.8/mkspecs/features/warn_on.prf \
+               /usr/local/Qt4.8/mkspecs/features/qt.prf \
+               /usr/local/Qt4.8/mkspecs/features/unix/thread.prf \
+               /usr/local/Qt4.8/mkspecs/features/moc.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/rez.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/sdk.prf \
+               /usr/local/Qt4.8/mkspecs/features/resources.prf \
+               /usr/local/Qt4.8/mkspecs/features/uic.prf \
+               /usr/local/Qt4.8/mkspecs/features/yacc.prf \
+               /usr/local/Qt4.8/mkspecs/features/lex.prf \
+               /usr/local/Qt4.8/mkspecs/features/include_source_dir.prf \
                mardrone.pro
 QMAKE_TARGET  = mardrone
 DESTDIR       = 
-TARGET        = mardrone
+TARGET        = mardrone.app/Contents/MacOS/mardrone
+
+####### Custom Compiler Variables
+QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS = -pipe \
+               -g \
+               -arch \
+               x86_64 \
+               -Xarch_x86_64 \
+               -mmacosx-version-min=10.5 \
+               -Wall \
+               -W
+
 
 first: all
 ####### Implicit rules
@@ -130,68 +166,113 @@ first: all
 
 ####### Build rules
 
-all: Makefile $(TARGET)
+all: Makefile mardrone.app/Contents/PkgInfo mardrone.app/Contents/Resources/empty.lproj mardrone.app/Contents/Info.plist $(TARGET)
 
 $(TARGET):  $(OBJECTS)  
+       @$(CHK_DIR_EXISTS) mardrone.app/Contents/MacOS/ || $(MKDIR) mardrone.app/Contents/MacOS/ 
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-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:
+Makefile: mardrone.pro  /usr/local/Qt4.8/mkspecs/macx-g++/qmake.conf /usr/local/Qt4.8/mkspecs/common/unix.conf \
+               /usr/local/Qt4.8/mkspecs/common/mac.conf \
+               /usr/local/Qt4.8/mkspecs/common/gcc-base.conf \
+               /usr/local/Qt4.8/mkspecs/common/gcc-base-macx.conf \
+               /usr/local/Qt4.8/mkspecs/common/g++-base.conf \
+               /usr/local/Qt4.8/mkspecs/common/g++-macx.conf \
+               /usr/local/Qt4.8/mkspecs/qconfig.pri \
+               /usr/local/Qt4.8/mkspecs/modules/qt_webkit_version.pri \
+               /usr/local/Qt4.8/mkspecs/features/qt_functions.prf \
+               /usr/local/Qt4.8/mkspecs/features/qt_config.prf \
+               /usr/local/Qt4.8/mkspecs/features/exclusive_builds.prf \
+               /usr/local/Qt4.8/mkspecs/features/default_pre.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/default_pre.prf \
+               deploy.pri \
+               /usr/local/Qt4.8/mkspecs/features/mac/dwarf2.prf \
+               /usr/local/Qt4.8/mkspecs/features/debug.prf \
+               /usr/local/Qt4.8/mkspecs/features/default_post.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/default_post.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/x86_64.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/objective_c.prf \
+               /usr/local/Qt4.8/mkspecs/features/link_pkgconfig.prf \
+               /usr/local/Qt4.8/mkspecs/features/declarative_debug.prf \
+               /usr/local/Qt4.8/mkspecs/features/warn_on.prf \
+               /usr/local/Qt4.8/mkspecs/features/qt.prf \
+               /usr/local/Qt4.8/mkspecs/features/unix/thread.prf \
+               /usr/local/Qt4.8/mkspecs/features/moc.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/rez.prf \
+               /usr/local/Qt4.8/mkspecs/features/mac/sdk.prf \
+               /usr/local/Qt4.8/mkspecs/features/resources.prf \
+               /usr/local/Qt4.8/mkspecs/features/uic.prf \
+               /usr/local/Qt4.8/mkspecs/features/yacc.prf \
+               /usr/local/Qt4.8/mkspecs/features/lex.prf \
+               /usr/local/Qt4.8/mkspecs/features/include_source_dir.prf \
+               /Library/Frameworks/QtDeclarative.framework/QtDeclarative.prl \
+               /Library/Frameworks/QtScript.framework/QtScript.prl \
+               /Library/Frameworks/QtCore.framework/QtCore.prl \
+               /Library/Frameworks/QtSvg.framework/QtSvg.prl \
+               /Library/Frameworks/QtGui.framework/QtGui.prl \
+               /Library/Frameworks/QtSql.framework/QtSql.prl \
+               /Library/Frameworks/QtXmlPatterns.framework/QtXmlPatterns.prl \
+               /Library/Frameworks/QtNetwork.framework/QtNetwork.prl
+       $(QMAKE) -spec /usr/local/Qt4.8/mkspecs/macx-g++ CONFIG+=declarative_debug -o Makefile mardrone.pro
+/usr/local/Qt4.8/mkspecs/common/unix.conf:
+/usr/local/Qt4.8/mkspecs/common/mac.conf:
+/usr/local/Qt4.8/mkspecs/common/gcc-base.conf:
+/usr/local/Qt4.8/mkspecs/common/gcc-base-macx.conf:
+/usr/local/Qt4.8/mkspecs/common/g++-base.conf:
+/usr/local/Qt4.8/mkspecs/common/g++-macx.conf:
+/usr/local/Qt4.8/mkspecs/qconfig.pri:
+/usr/local/Qt4.8/mkspecs/modules/qt_webkit_version.pri:
+/usr/local/Qt4.8/mkspecs/features/qt_functions.prf:
+/usr/local/Qt4.8/mkspecs/features/qt_config.prf:
+/usr/local/Qt4.8/mkspecs/features/exclusive_builds.prf:
+/usr/local/Qt4.8/mkspecs/features/default_pre.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/default_pre.prf:
+deploy.pri:
+/usr/local/Qt4.8/mkspecs/features/mac/dwarf2.prf:
+/usr/local/Qt4.8/mkspecs/features/debug.prf:
+/usr/local/Qt4.8/mkspecs/features/default_post.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/default_post.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/x86_64.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/objective_c.prf:
+/usr/local/Qt4.8/mkspecs/features/link_pkgconfig.prf:
+/usr/local/Qt4.8/mkspecs/features/declarative_debug.prf:
+/usr/local/Qt4.8/mkspecs/features/warn_on.prf:
+/usr/local/Qt4.8/mkspecs/features/qt.prf:
+/usr/local/Qt4.8/mkspecs/features/unix/thread.prf:
+/usr/local/Qt4.8/mkspecs/features/moc.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/rez.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/sdk.prf:
+/usr/local/Qt4.8/mkspecs/features/resources.prf:
+/usr/local/Qt4.8/mkspecs/features/uic.prf:
+/usr/local/Qt4.8/mkspecs/features/yacc.prf:
+/usr/local/Qt4.8/mkspecs/features/lex.prf:
+/usr/local/Qt4.8/mkspecs/features/include_source_dir.prf:
+/Library/Frameworks/QtDeclarative.framework/QtDeclarative.prl:
+/Library/Frameworks/QtScript.framework/QtScript.prl:
+/Library/Frameworks/QtCore.framework/QtCore.prl:
+/Library/Frameworks/QtSvg.framework/QtSvg.prl:
+/Library/Frameworks/QtGui.framework/QtGui.prl:
+/Library/Frameworks/QtSql.framework/QtSql.prl:
+/Library/Frameworks/QtXmlPatterns.framework/QtXmlPatterns.prl:
+/Library/Frameworks/QtNetwork.framework/QtNetwork.prl:
 qmake:  FORCE
-       @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile mardrone.pro
-
+       @$(QMAKE) -spec /usr/local/Qt4.8/mkspecs/macx-g++ CONFIG+=declarative_debug -o Makefile mardrone.pro
+
+mardrone.app/Contents/PkgInfo: 
+       @$(CHK_DIR_EXISTS) mardrone.app/Contents || $(MKDIR) mardrone.app/Contents 
+       @$(DEL_FILE) mardrone.app/Contents/PkgInfo
+       @echo "APPL????" >mardrone.app/Contents/PkgInfo
+mardrone.app/Contents/Resources/empty.lproj: 
+       @$(CHK_DIR_EXISTS) mardrone.app/Contents/Resources || $(MKDIR) mardrone.app/Contents/Resources 
+       @touch mardrone.app/Contents/Resources/empty.lproj
+       
+mardrone.app/Contents/Info.plist: 
+       @$(CHK_DIR_EXISTS) mardrone.app/Contents || $(MKDIR) mardrone.app/Contents 
+       @$(DEL_FILE) mardrone.app/Contents/Info.plist
+       @sed -e "s,@SHORT_VERSION@,1.0,g" -e "s,@TYPEINFO@,????,g" -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,mardrone,g" -e "s,@TYPEINFO@,????,g" /usr/local/Qt4.8/mkspecs/macx-g++/Info.plist.app >mardrone.app/Contents/Info.plist
 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 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
+       $(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 gauges/gaugearc.h uilistelement.h gauges/gaugehsi.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 gauges/gaugearc.cpp uilistelement.cpp gauges/gaugehsi.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 
@@ -202,7 +283,7 @@ clean:compiler_clean
 ####### Sub-libraries
 
 distclean: clean
-       -$(DEL_FILE) $(TARGET) 
+       -$(DEL_FILE) -r mardrone.app
        -$(DEL_FILE) Makefile
 
 
@@ -212,39 +293,51 @@ 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_gaugetape.cpp moc_gaugehorizon.cpp moc_joystick.cpp moc_qdeclarativetoucharea.cpp
+compiler_objective_c_make_all:
+compiler_objective_c_clean:
+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 moc_gaugearc.cpp moc_uilistelement.cpp moc_gaugehsi.cpp
 compiler_moc_header_clean:
-       -$(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
+       -$(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_gaugearc.cpp moc_uilistelement.cpp moc_gaugehsi.cpp
 moc_dronecontrol.cpp: dronelib/dronecontrol.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/dronecontrol.h -o moc_dronecontrol.cpp
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ dronelib/dronecontrol.h -o moc_dronecontrol.cpp
 
 moc_navdata.cpp: dronelib/navdata.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/navdata.h -o moc_navdata.cpp
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ dronelib/navdata.h -o moc_navdata.cpp
 
 moc_video.cpp: dronelib/dronecontrol.h \
                dronelib/video.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/video.h -o moc_video.cpp
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ dronelib/video.h -o moc_video.cpp
 
 moc_gauge.cpp: gauges/gauge.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gauge.h -o moc_gauge.cpp
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gauge.h -o moc_gauge.cpp
 
 moc_gaugelabel.cpp: gauges/gauge.h \
                gauges/gaugelabel.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gaugelabel.h -o moc_gaugelabel.cpp
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gaugelabel.h -o moc_gaugelabel.cpp
 
 moc_gaugetape.cpp: gauges/gauge.h \
                gauges/gaugetape.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gaugetape.h -o moc_gaugetape.cpp
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ 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
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ 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
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ dronelib/joystick.h -o moc_joystick.cpp
 
 moc_qdeclarativetoucharea.cpp: qdeclarativetoucharea.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) qdeclarativetoucharea.h -o moc_qdeclarativetoucharea.cpp
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ qdeclarativetoucharea.h -o moc_qdeclarativetoucharea.cpp
+
+moc_gaugearc.cpp: gauges/gauge.h \
+               gauges/gaugearc.h
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gaugearc.h -o moc_gaugearc.cpp
+
+moc_uilistelement.cpp: uilistelement.h
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ uilistelement.h -o moc_uilistelement.cpp
+
+moc_gaugehsi.cpp: gauges/gaugehsi.h
+       /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gaugehsi.h -o moc_gaugehsi.cpp
 
 compiler_rcc_make_all: qrc_ardrone.cpp
 compiler_rcc_clean:
@@ -254,8 +347,10 @@ qrc_ardrone.cpp: ardrone.qrc \
                gauges/HeadingGauge.qml \
                ConfigDialogDesktop.qml \
                ardrone_harmattan.qml \
+               gauges/GenericGauge.qml \
                gauges/AltGauge.qml \
                gear32x32.png \
+               gauges/tach-2700-redline.png \
                gauges/EfisPFD.qml \
                gauges/hdg2.png \
                gauges/glareshield1.png \
@@ -277,6 +372,7 @@ qrc_ardrone.cpp: ardrone.qrc \
                joybox.png \
                ardrone_desktop.qml \
                gauges/ati4.png \
+               ardrone_plainqml.qml \
                gauges/bezel.png \
                gauges/alt2.png \
                ConfigDialog.qml \
@@ -286,13 +382,15 @@ qrc_ardrone.cpp: ardrone.qrc \
                gauges/EfisPFD.qml \
                gauges/AltGauge.qml \
                gauges/qmldir
-       /usr/bin/rcc -name ardrone ardrone.qrc -o qrc_ardrone.cpp
+       /Developer/Tools/Qt/rcc -name ardrone ardrone.qrc -o qrc_ardrone.cpp
 
 compiler_image_collection_make_all: qmake_image_collection.cpp
 compiler_image_collection_clean:
        -$(DEL_FILE) qmake_image_collection.cpp
 compiler_moc_source_make_all:
 compiler_moc_source_clean:
+compiler_rez_source_make_all:
+compiler_rez_source_clean:
 compiler_uic_make_all:
 compiler_uic_clean:
 compiler_yacc_decl_make_all:
@@ -305,7 +403,8 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean
 
 ####### Compile
 
-main.o: main.cpp qdeclarativetoucharea.h
+main.o: main.cpp uilistelement.h \
+               qdeclarativetoucharea.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
 
 dronecontrol.o: dronelib/dronecontrol.cpp dronelib/dronecontrol.h \
@@ -340,6 +439,17 @@ joystick.o: dronelib/joystick.cpp dronelib/joystick.h
 qdeclarativetoucharea.o: qdeclarativetoucharea.cpp qdeclarativetoucharea.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qdeclarativetoucharea.o qdeclarativetoucharea.cpp
 
+gaugearc.o: gauges/gaugearc.cpp gauges/gaugearc.h \
+               gauges/gauge.h \
+               gauges/gaugetape.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugearc.o gauges/gaugearc.cpp
+
+uilistelement.o: uilistelement.cpp uilistelement.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o uilistelement.o uilistelement.cpp
+
+gaugehsi.o: gauges/gaugehsi.cpp gauges/gaugehsi.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugehsi.o gauges/gaugehsi.cpp
+
 moc_dronecontrol.o: moc_dronecontrol.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dronecontrol.o moc_dronecontrol.cpp
 
@@ -367,24 +477,34 @@ moc_joystick.o: moc_joystick.cpp
 moc_qdeclarativetoucharea.o: moc_qdeclarativetoucharea.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_qdeclarativetoucharea.o moc_qdeclarativetoucharea.cpp
 
+moc_gaugearc.o: moc_gaugearc.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_gaugearc.o moc_gaugearc.cpp
+
+moc_uilistelement.o: moc_uilistelement.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_uilistelement.o moc_uilistelement.cpp
+
+moc_gaugehsi.o: moc_gaugehsi.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_gaugehsi.o moc_gaugehsi.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)/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)"
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/mardrone/bin/ || $(MKDIR) $(INSTALL_ROOT)/opt/mardrone/bin/ 
+       $(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+       
+       -$(INSTALL_DIR) "mardrone.app" "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
 
 uninstall_target:  FORCE
-       -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
-       -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/ 
+       -$(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+       -$(DEL_DIR) $(INSTALL_ROOT)/opt/mardrone/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/
+       -$(INSTALL_FILE) /Users/kate/scratchbox/harmattan/mardrone/mardrone/mardrone.desktop $(INSTALL_ROOT)/usr/share/applications/
 
 
 uninstall_desktopfile:  FORCE
@@ -392,9 +512,31 @@ uninstall_desktopfile:  FORCE
        -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/applications/ 
 
 
-install:  install_target install_desktopfile  FORCE
+install_desktopfile: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/ 
+       -$(INSTALL_FILE) /Users/kate/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_target: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/mardrone/bin/ || $(MKDIR) $(INSTALL_ROOT)/opt/mardrone/bin/ 
+       $(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+       
+       -$(INSTALL_DIR) "mardrone.app" "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+
+uninstall_target:  FORCE
+       -$(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app" 
+        -$(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+       -$(DEL_DIR) $(INSTALL_ROOT)/opt/mardrone/bin/ 
+
+
+install:  install_target install_desktopfile install_desktopfile install_target  FORCE
 
-uninstall: uninstall_target uninstall_desktopfile   FORCE
+uninstall: uninstall_target uninstall_desktopfile uninstall_desktopfile uninstall_target   FORCE
 
 FORCE: