summaryrefslogtreecommitdiff
authorar <ar>2004-05-01 21:43:55 (UTC)
committer ar <ar>2004-05-01 21:43:55 (UTC)
commitc3c3d7c9be7b6ff1c905686bd960877f816962ff (patch) (side-by-side diff)
tree0766ac99f1e66b83beca222426e1a08faeff53c1
parent8aa8b5166653d52f9623fbb1391d044916a2a260 (diff)
downloadopie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.zip
opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.gz
opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.bz2
- use lib and inlcude dir from dependencies before the other dir's
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/dagger/dagger.pro6
-rw-r--r--noncore/games/sfcave-sdl/sfcave-sdl.pro7
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro7
-rw-r--r--noncore/net/mail/libmailwrapper/libmailwrapper.pro4
-rw-r--r--noncore/net/mail/mail.pro4
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
@@ -19,6 +19,12 @@ TARGET = dagger
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
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
@@ -50,6 +50,13 @@ HEADERS = animatedimage.h \
stringtokenizer.h \
settings.h \
starfield.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
@@ -17,6 +17,13 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lpthread -lopiecore2 -lxine -lstdc++
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
@@ -48,11 +48,11 @@ contains( $(CONFIG_TARGET_MACOSX), y ){
DESTDIR = $(OPIEDIR)/lib
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
@@ -62,11 +62,11 @@ contains( CONFTEST, y ){
}
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
}