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
@@ -72,8 +72,33 @@ 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 '^#' | \
diff --git a/dependencies.in b/dependencies.in
index e00f269..deff7bb 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -39,9 +39,9 @@
    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

diff --git a/Rules.make b/Rules.make index 94a79e7..75d671e 100644 --- a/Rules.make +++ b/Rules.make
@@ -72,8 +72,33 @@ endif
72	echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@	72	echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
73	ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)	73	ifeq ($(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) >> $@
75	endif	75	endif
		76	# Write LIB dirs and INC dirs...
		77	ifeq ($(CONFIG_LIBETPAN_DEP),y)
		78	echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
		79	echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
		80	endif
		81	ifeq ($(CONFIG_LIBPCAP_DEP),y)
		82	echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@
		83	echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@
		84	endif
		85	ifeq ($(CONFIG_LIBSQLITE_DEP),y)
		86	echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
		87	echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
		88	endif
		89	ifeq ($(CONFIG_LIBXINE_DEP),y)
		90	echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
		91	echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
		92	endif
		93	ifeq ($(CONFIG_LIBIPK_DEP),y)
		94	echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
		95	echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
		96	endif
		97	ifeq ($(CONFIG_LIBSDK_DEP),y)
		98	echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
		99	echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
		100	endif
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 '^#' \| \


diff --git a/dependencies.in b/dependencies.in index e00f269..deff7bb 100644 --- a/dependencies.in +++ b/dependencies.in
@@ -39,9 +39,9 @@
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