summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-28 10:29:22 (UTC)
committer mickeyl <mickeyl>2004-04-28 10:29:22 (UTC)
commit7784d05b07dc65eab1754497e71fbf56d714b048 (patch) (side-by-side diff)
treed9b4dbde4b1e4efa3e2c3ba7ae9c37fda9780c26
parent1343398e0df890b2e8bd5f1d9a0867b291d42691 (diff)
downloadopie-7784d05b07dc65eab1754497e71fbf56d714b048.zip
opie-7784d05b07dc65eab1754497e71fbf56d714b048.tar.gz
opie-7784d05b07dc65eab1754497e71fbf56d714b048.tar.bz2
CLEANUP: remove relative includes over the source tree
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make1
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.cpp4
-rw-r--r--noncore/net/opieftp/opieftp.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/Rules.make b/Rules.make
index e86f662..f0e463b 100644
--- a/Rules.make
+++ b/Rules.make
@@ -169,12 +169,13 @@ endif
( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
# auxilliary libraries
( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
( cd include/sl && ln -sf ../../libslcompat/*.h .; )
+ ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
# all
ifeq ($(CONFIG_LIBOPIE),y)
( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
endif
( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
index e8ade87..aed53c6 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
@@ -8,17 +8,17 @@
// * the Free Software Foundation; either version 2 of the License, or *
// * (at your option) any later version. *
// ***************************************************************************/
// // half-assed attempt at providing a network dialog.
// /* Created: Sun Aug 27 15:24:52 2000*/
#include <unistd.h>
+
extern "C" {
-#include "../../net/ftplib/ftplib.h"
+#include <ftplib.h>
}
-
#include "NetworkDialog.h"
#include "gutenbrowser.h"
#include <qprogressbar.h>
#include <qstringlist.h>
#include <qpe/config.h>
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index fe96103..aa4314a 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -11,13 +11,13 @@
***************************************************************************/
//#define DEVELOPERS_VERSION
#include "opieftp.h"
extern "C" {
-#include "../ftplib/ftplib.h"
+#include <ftplib.h>
}
#include "inputDialog.h"
/* OPIE */
#include <opie2/odebug.h>