author | ar <ar> | 2004-05-01 21:43:55 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-01 21:43:55 (UTC) |
commit | c3c3d7c9be7b6ff1c905686bd960877f816962ff (patch) (unidiff) | |
tree | 0766ac99f1e66b83beca222426e1a08faeff53c1 /noncore | |
parent | 8aa8b5166653d52f9623fbb1391d044916a2a260 (diff) | |
download | opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.zip opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.gz opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.bz2 |
- use lib and inlcude dir from dependencies before the other dir's
-rw-r--r-- | noncore/apps/dagger/dagger.pro | 6 | ||||
-rw-r--r-- | noncore/games/sfcave-sdl/sfcave-sdl.pro | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 7 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/libmailwrapper.pro | 4 | ||||
-rw-r--r-- | noncore/net/mail/mail.pro | 4 |
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 | |||
@@ -23,2 +23,8 @@ LIBS += -lopiecore2 -lopieui2 -lqpe -lsword | |||
23 | include ( $(OPIEDIR)/include.pro ) | 23 | include ( $(OPIEDIR)/include.pro ) |
24 | 24 | ||
25 | !isEmpty( LIBSWORD_INC_DIR ) { | ||
26 | INCLUDEPATH = $$LIBSWORD_INC_DIR $$INCLUDEPATH | ||
27 | } | ||
28 | !isEmpty( LIBSWORD_LIB_DIR ) { | ||
29 | LIBS = -L$$LIBSWORD_LIB_DIR $$LIBS | ||
30 | } | ||
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 | |||
@@ -54,2 +54,9 @@ HEADERS = animatedimage.h \ | |||
54 | 54 | ||
55 | include ( $(OPIEDIR)/include.pro ) | 55 | include ( $(OPIEDIR)/include.pro ) |
56 | |||
57 | !isEmpty( LIBSDL_INC_DIR ) { | ||
58 | INCLUDEPATH = $$LIBSDL_INC_DIR $$INCLUDEPATH | ||
59 | } | ||
60 | !isEmpty( LIBSDL_LIB_DIR ) { | ||
61 | LIBS = -L$$LIBSDL_LIB_DIR $$LIBS | ||
62 | } | ||
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 | |||
@@ -21,2 +21,9 @@ OBJECTS_DIR = qpeobj | |||
21 | 21 | ||
22 | include ( $(OPIEDIR)/include.pro ) | 22 | include ( $(OPIEDIR)/include.pro ) |
23 | |||
24 | !isEmpty( LIBXINE_INC_DIR ) { | ||
25 | INCLUDEPATH = $$LIBXINE_INC_DIR $$INCLUDEPATH | ||
26 | } | ||
27 | !isEmpty( LIBXINE_LIB_DIR ) { | ||
28 | LIBS = -L$$LIBXINE_LIB_DIR $$LIBS | ||
29 | } | ||
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 | |||
@@ -52,7 +52,7 @@ include ( $(OPIEDIR)/include.pro ) | |||
52 | 52 | ||
53 | !isEmpty( LIBETPAN_INC_DIR ) { | 53 | !isEmpty( LIBETPAN_INC_DIR ) { |
54 | INCLUDEPATH += $$LIBETPAN_INC_DIR | 54 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH |
55 | } | 55 | } |
56 | !isEmpty( LIBETPAN_LIB_DIR ) { | 56 | !isEmpty( LIBETPAN_LIB_DIR ) { |
57 | LIBS += -L$$LIBETPAN_LIB_DIR | 57 | LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS |
58 | } | 58 | } |
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 | |||
@@ -66,7 +66,7 @@ TARGET = opiemail | |||
66 | include ( $(OPIEDIR)/include.pro ) | 66 | include ( $(OPIEDIR)/include.pro ) |
67 | !isEmpty( LIBETPAN_INC_DIR ) { | 67 | !isEmpty( LIBETPAN_INC_DIR ) { |
68 | INCLUDEPATH += $$LIBETPAN_INC_DIR | 68 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH |
69 | } | 69 | } |
70 | !isEmpty( LIBETPAN_LIB_DIR ) { | 70 | !isEmpty( LIBETPAN_LIB_DIR ) { |
71 | LIBS += -Wl,-rpath-link,$$LIBETPAN_LIB_DIR | 71 | LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS |
72 | } | 72 | } |