- use lib and inlcude dir from dependencies before the other dir's

5 files changed, 24 insertions, 4 deletions

diff --git a/noncore/apps/dagger/dagger.pro b/noncore/apps/dagger/dagger.pro
index 96aeef9..d697669 100644
--- a/noncore/apps/dagger/dagger.pro
+++ b/noncore/apps/dagger/dagger.pro
@@ -22,3 +22,9 @@ LIBS        += -lopiecore2 -lopieui2 -lqpe -lsword
 
 include ( $(OPIEDIR)/include.pro )
 
+!isEmpty( LIBSWORD_INC_DIR ) {
+    INCLUDEPATH = $$LIBSWORD_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBSWORD_LIB_DIR ) {
+    LIBS = -L$$LIBSWORD_LIB_DIR $$LIBS
+}
diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.pro b/noncore/games/sfcave-sdl/sfcave-sdl.pro
index 2d4dcf1..8372919 100644
--- a/noncore/games/sfcave-sdl/sfcave-sdl.pro
+++ b/noncore/games/sfcave-sdl/sfcave-sdl.pro
@@ -53,3 +53,10 @@ HEADERS = 	animatedimage.h \
                 util.h
 
 include ( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBSDL_INC_DIR ) {
+    INCLUDEPATH = $$LIBSDL_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBSDL_LIB_DIR ) {
+    LIBS = -L$$LIBSDL_LIB_DIR $$LIBS
+}
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 15f7d61..9388496 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -20,3 +20,10 @@ MOC_DIR   = qpeobj
 OBJECTS_DIR = qpeobj
 
 include ( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBXINE_INC_DIR ) {
+    INCLUDEPATH = $$LIBXINE_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBXINE_LIB_DIR ) {
+    LIBS = -L$$LIBXINE_LIB_DIR $$LIBS
+}
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
index 5e44064..befadd7 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -51,8 +51,8 @@ TARGET       = mailwrapper
 include ( $(OPIEDIR)/include.pro )
 
 !isEmpty( LIBETPAN_INC_DIR ) {
-        INCLUDEPATH += $$LIBETPAN_INC_DIR
+    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
-        LIBS += -L$$LIBETPAN_LIB_DIR
+    LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS
 }
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index a3328cb..c88923f 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -65,8 +65,8 @@ TARGET       = opiemail
 
 include ( $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
-        INCLUDEPATH += $$LIBETPAN_INC_DIR
+    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
-        LIBS += -Wl,-rpath-link,$$LIBETPAN_LIB_DIR
+    LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS
 }