10 files changed, 12 insertions, 24 deletions
diff --git a/noncore/tools/calc2/binary/binaryfactory.cpp b/noncore/tools/calc2/binary/binaryfactory.cpp
index bccc9ca..2489fdd 100644
--- a/noncore/tools/calc2/binary/binaryfactory.cpp
+++ b/noncore/tools/calc2/binary/binaryfactory.cpp
@@ -23,5 +23,5 @@
 #include "binaryfactory.h"
 #include "binaryimpl.h"
-#include "../engine.h"
+#include "engine.h"
 
 QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) {
diff --git a/noncore/tools/calc2/binary/binaryfactory.h b/noncore/tools/calc2/binary/binaryfactory.h
index 237a926..8bad233 100644
--- a/noncore/tools/calc2/binary/binaryfactory.h
+++ b/noncore/tools/calc2/binary/binaryfactory.h
@@ -23,6 +23,6 @@
 
 #include "binaryimpl.h"
-#include "../plugininterface.h"
-#include "../engine.h"
+#include "plugininterface.h"
+#include "engine.h"
 
 class BinaryInterface : public CalcInterface
diff --git a/noncore/tools/calc2/binary/binaryimpl.cpp b/noncore/tools/calc2/binary/binaryimpl.cpp
index ecbf232..2629d07 100644
--- a/noncore/tools/calc2/binary/binaryimpl.cpp
+++ b/noncore/tools/calc2/binary/binaryimpl.cpp
@@ -20,5 +20,5 @@
 
 #include "binaryimpl.h"
-#include "../instruction.h"
+#include "instruction.h"
 
 class iXOR : public Instruction {
diff --git a/noncore/tools/calc2/binary/binaryimpl.h b/noncore/tools/calc2/binary/binaryimpl.h
index 7bf123a..f36a31e 100644
--- a/noncore/tools/calc2/binary/binaryimpl.h
+++ b/noncore/tools/calc2/binary/binaryimpl.h
@@ -22,5 +22,5 @@
 
 #include "binary.h"
-#include "../engine.h"
+#include "engine.h"
 
 class FormBinaryImpl : public FormBinary {
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
deleted file mode 100644
index 191a4df..0000000
--- a/noncore/tools/calc2/calc.pro
+++ b/dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-CONFIG += qt 
-# Input
-HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
-SOURCES += calc.cpp main.cpp engine.cpp
-INCLUDEPATH     += $(OPIEDIR)/include 
-DEPENDPATH      += $(OPIEDIR)/include 
-LIBS += -lqpe -Wl,-export-dynamic 
-TARGET = calc
-DESTDIR = $(OPIEDIR)/bin
-
-include( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/main/main.pro b/noncore/tools/calc2/main/main.pro
index e2eda1f..2ef993d 100644
--- a/noncore/tools/calc2/main/main.pro
+++ b/noncore/tools/calc2/main/main.pro
@@ -6,5 +6,5 @@ SOURCES += calc.cpp main.cpp engine.cpp
 INCLUDEPATH     += $(OPIEDIR)/include 
 DEPENDPATH      += $(OPIEDIR)/include 
-LIBS += -lqpe -Wl,-export-dynamic 
+LIBS += -lqpe -Wl,-export-dynamic -lopiecore2
 TARGET = calc2
 DESTDIR = $(OPIEDIR)/bin
diff --git a/noncore/tools/calc2/simple/simplefactory.cpp b/noncore/tools/calc2/simple/simplefactory.cpp
index 52b090b..d594e9c 100644
--- a/noncore/tools/calc2/simple/simplefactory.cpp
+++ b/noncore/tools/calc2/simple/simplefactory.cpp
@@ -23,5 +23,5 @@
 #include "simplefactory.h"
 #include "simpleimpl.h"
-#include "../engine.h"
+#include "engine.h"
 
 QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) {
diff --git a/noncore/tools/calc2/simple/simplefactory.h b/noncore/tools/calc2/simple/simplefactory.h
index 460c2b9..0487158 100644
--- a/noncore/tools/calc2/simple/simplefactory.h
+++ b/noncore/tools/calc2/simple/simplefactory.h
@@ -23,6 +23,6 @@
 
 #include "simpleimpl.h"
-#include "../plugininterface.h"
-#include "../engine.h"
+#include "plugininterface.h"
+#include "engine.h"
 
 class SimpleInterface : public CalcInterface
diff --git a/noncore/tools/calc2/simple/simpleimpl.cpp b/noncore/tools/calc2/simple/simpleimpl.cpp
index 447cbdf..3cec4e0 100644
--- a/noncore/tools/calc2/simple/simpleimpl.cpp
+++ b/noncore/tools/calc2/simple/simpleimpl.cpp
@@ -23,5 +23,5 @@
 
 #include "simpleimpl.h"
-#include "../stdinstructions.h"
+#include "stdinstructions.h"
 
 void FormSimpleImpl::CEClicked() {
diff --git a/noncore/tools/calc2/simple/simpleimpl.h b/noncore/tools/calc2/simple/simpleimpl.h
index b7b83e2..a2db154 100644
--- a/noncore/tools/calc2/simple/simpleimpl.h
+++ b/noncore/tools/calc2/simple/simpleimpl.h
@@ -26,6 +26,6 @@
 
 #include "simple.h"
-#include "../engine.h"
-#include "../instruction.h"
+#include "engine.h"
+#include "instruction.h"
 
 class FormSimpleImpl:public FormSimple {