summaryrefslogtreecommitdiff
Unidiff
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
@@ -70,12 +70,37 @@ ifeq ($(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" \
diff --git a/dependencies.in b/dependencies.in
index e00f269..deff7bb 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -37,13 +37,13 @@
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