summaryrefslogtreecommitdiff
Side-by-side diff
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)
echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
endif
echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
endif
+# Write LIB dirs and INC dirs...
+ifeq ($(CONFIG_LIBETPAN_DEP),y)
+ echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
+ echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
+endif
+ifeq ($(CONFIG_LIBPCAP_DEP),y)
+ echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@
+ echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@
+endif
+ifeq ($(CONFIG_LIBSQLITE_DEP),y)
+ echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
+ echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
+endif
+ifeq ($(CONFIG_LIBXINE_DEP),y)
+ echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
+ echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
+endif
+ifeq ($(CONFIG_LIBIPK_DEP),y)
+ echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
+ echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
+endif
+ifeq ($(CONFIG_LIBSDK_DEP),y)
+ echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
+ echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
+endif
$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
@echo Generating dependency information...
# add to subdir-y, and add descend rules
@cat $(TOPDIR)/packages | grep -v '^#' | \
awk '{print \
".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 @@
config LIBXINE_DEP
boolean "have libxine 1.0 beta11"
default "n"
config LIBXINE_LIB_DIR
string "LIBXINE library dir"
- depends "LIBXINE_DEP
+ depends LIBXINE_DEP
config LIBXINE_INC_DIR
string "LIBXINE include dir"
depends LIBXINE_DEP
config LIBIPK_DEP