summaryrefslogtreecommitdiff
authorzecke <zecke>2004-04-08 11:20:25 (UTC)
committer zecke <zecke>2004-04-08 11:20:25 (UTC)
commit30cd4f984ea142ae4320de5718d58b7cf083befb (patch) (unidiff)
treef2335257392536c77d018c6653c495a235b0638d
parent2ab70064958916733daf1b5f095cef562b2e9163 (diff)
downloadopie-30cd4f984ea142ae4320de5718d58b7cf083befb.zip
opie-30cd4f984ea142ae4320de5718d58b7cf083befb.tar.gz
opie-30cd4f984ea142ae4320de5718d58b7cf083befb.tar.bz2
Write out the LIB and INC Dir for the dependencies into
the .pro Now the apps can pick it up if they want
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make25
-rw-r--r--dependencies.in2
2 files changed, 26 insertions, 1 deletions
diff --git a/Rules.make b/Rules.make
index 94a79e7..75d671e 100644
--- a/Rules.make
+++ b/Rules.make
@@ -60,32 +60,57 @@ endif
60ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) 60ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
61 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ 61 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
62endif 62endif
63ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) 63ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
64 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ 64 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@
65endif 65endif
66ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 66ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
67 echo DEFINES += OPIE_NEW_MALLOC >> $@ 67 echo DEFINES += OPIE_NEW_MALLOC >> $@
68endif 68endif
69ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) 69ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
70 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ 70 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
71endif 71endif
72 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ 72 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
73ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) 73ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
74 echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ 74 echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
75endif 75endif
76# Write LIB dirs and INC dirs...
77ifeq ($(CONFIG_LIBETPAN_DEP),y)
78 echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
79 echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
80endif
81ifeq ($(CONFIG_LIBPCAP_DEP),y)
82 echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@
83 echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@
84endif
85ifeq ($(CONFIG_LIBSQLITE_DEP),y)
86 echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
87 echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
88endif
89ifeq ($(CONFIG_LIBXINE_DEP),y)
90 echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
91 echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
92endif
93ifeq ($(CONFIG_LIBIPK_DEP),y)
94 echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
95 echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
96endif
97ifeq ($(CONFIG_LIBSDK_DEP),y)
98 echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
99 echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
100endif
76$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 101$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
77 @echo Generating dependency information... 102 @echo Generating dependency information...
78# add to subdir-y, and add descend rules 103# add to subdir-y, and add descend rules
79 @cat $(TOPDIR)/packages | grep -v '^#' | \ 104 @cat $(TOPDIR)/packages | grep -v '^#' | \
80 awk '{print \ 105 awk '{print \
81 ".PHONY : " $$2 "\n" \ 106 ".PHONY : " $$2 "\n" \
82 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 107 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
83 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 108 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
84 cat $(TOPDIR)/packages | grep -v '^#' | \ 109 cat $(TOPDIR)/packages | grep -v '^#' | \
85 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 110 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
86 >> $(TOPDIR)/.depends 111 >> $(TOPDIR)/.depends
87# interpackage dependency generation 112# interpackage dependency generation
88 @cat $(TOPDIR)/packages | \ 113 @cat $(TOPDIR)/packages | \
89 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 114 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
90 115
91$(TOPDIR)/.depends.cfgs: 116$(TOPDIR)/.depends.cfgs:
diff --git a/dependencies.in b/dependencies.in
index e00f269..deff7bb 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -27,33 +27,33 @@
27 default n 27 default n
28 28
29 config LIBSQLITE_LIB_DIR 29 config LIBSQLITE_LIB_DIR
30 string "LIBSQLITE library dir" 30 string "LIBSQLITE library dir"
31 depends LIBSQLITE_DEP 31 depends LIBSQLITE_DEP
32 32
33 config LIBSQLITE_INC_DIR 33 config LIBSQLITE_INC_DIR
34 string "LIBSQLITE include dir" 34 string "LIBSQLITE include dir"
35 depends LIBSQLITE_DEP 35 depends LIBSQLITE_DEP
36 36
37 config LIBXINE_DEP 37 config LIBXINE_DEP
38 boolean "have libxine 1.0 beta11" 38 boolean "have libxine 1.0 beta11"
39 default "n" 39 default "n"
40 40
41 config LIBXINE_LIB_DIR 41 config LIBXINE_LIB_DIR
42 string "LIBXINE library dir" 42 string "LIBXINE library dir"
43 depends "LIBXINE_DEP 43 depends LIBXINE_DEP
44 44
45 config LIBXINE_INC_DIR 45 config LIBXINE_INC_DIR
46 string "LIBXINE include dir" 46 string "LIBXINE include dir"
47 depends LIBXINE_DEP 47 depends LIBXINE_DEP
48 48
49 config LIBIPK_DEP 49 config LIBIPK_DEP
50 boolean "have libipkg v109 or greater" 50 boolean "have libipkg v109 or greater"
51 default "n" 51 default "n"
52 52
53 config LIBIPK_LIB_DIR 53 config LIBIPK_LIB_DIR
54 string "libipkg library dir" 54 string "libipkg library dir"
55 depends LIBIPK_DEP 55 depends LIBIPK_DEP
56 56
57 config LIBIPK_INC_DIR 57 config LIBIPK_INC_DIR
58 string "libipkg include dir" 58 string "libipkg include dir"
59 depends LIBIPK_DEP 59 depends LIBIPK_DEP