More changes due to directory updates

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@108 fdac6126-5c0c-442c-9429-916003d36597

src/OpenMesh/Apps/Decimating/DecimaterGui/DecimaterGui.pro

@@ -2,11 +2,9 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
+
+Application()
 
 INCLUDEPATH += ../../..
 

src/OpenMesh/Apps/Decimating/commandlineDecimater/commandlineDecimater.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 INCLUDEPATH += ../../..
 

src/OpenMesh/Apps/QtViewer/QtViewer.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 Application()
 glew()

src/OpenMesh/Apps/Smoothing/Smoothing.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-        include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 INCLUDEPATH += ../../..
 

src/OpenMesh/Apps/Subdivider/SubdividerGui/SubdividerGui.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 INCLUDEPATH += ../../..
 

src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 INCLUDEPATH += ../../..
 

src/OpenMesh/Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 INCLUDEPATH += ../../..
 

src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 INCLUDEPATH += ../../../..
 

src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 INCLUDEPATH += ../../../..
 

src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro

@@ -2,11 +2,7 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 INCLUDEPATH += ../../../..
 

src/OpenMesh/Apps/mconvert/mconvert.pro

@@ -2,15 +2,12 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
+
+Application()
 
 INCLUDEPATH += ../../..
 
-Application()
 glew()
 glut()
 openmesh()

src/OpenMesh/Core/Core.pro

@@ -2,22 +2,22 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 Library()
 
+contains( OPENFLIPPER , OpenFlipper ){
+	DESTDIR = $${TOPDIR}/OpenMesh/lib
+} else {
+	DESTDIR = $${TOPDIR}/lib
+}
+
+
 DIRECTORIES = . Geometry IO IO/exporter IO/importer IO/reader IO/writer \
 		Mesh Mesh/gen System Utils
 
 INCLUDEPATH += ../..
 
-
-DESTDIR = $${TOPDIR}/lib
-
 CONFIG( debug, debug|release ){
         TARGET    = OpenMeshCored
 } else {

src/OpenMesh/Tools/Tools.pro

@@ -2,30 +2,28 @@
 #
 ################################################################################
 
-contains( OPENFLIPPER , OpenFlipper ){
 include( $$TOPDIR/qmake/all.include )
-} else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
-}
 
 Library()
 
+contains( OPENFLIPPER , OpenFlipper ){
+        DESTDIR = $${TOPDIR}/OpenMesh/lib
+} else {
+        DESTDIR = $${TOPDIR}/lib
+}
+
 DIRECTORIES = . Decimater Smoother Subdivider/Adaptive/Composite \
         	Subdivider/Uniform/Composite Subdivider/Uniform \
 		Utils
 
 INCLUDEPATH += ../..
 
-DESTDIR = $${TOPDIR}/lib
-
 CONFIG( debug, debug|release ){
         TARGET    = OpenMeshToolsd
 } else {
         TARGET    = OpenMeshTools
 }
 
-
-
 win32 {
  DEFINES += _USE_MATH_DEFINES NOMINMAX
  CONFIG  += static