| author | zecke <zecke> | 2004-04-08 11:20:25 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-04-08 11:20:25 (UTC) |
| commit | 30cd4f984ea142ae4320de5718d58b7cf083befb (patch) (side-by-side diff) | |
| tree | f2335257392536c77d018c6653c495a235b0638d | |
| parent | 2ab70064958916733daf1b5f095cef562b2e9163 (diff) | |
| download | opie-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
| -rw-r--r-- | Rules.make | 25 | ||||
| -rw-r--r-- | dependencies.in | 2 |
2 files changed, 26 insertions, 1 deletions
@@ -64,24 +64,49 @@ ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ endif ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) echo DEFINES += OPIE_NEW_MALLOC >> $@ endif 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" \ "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends cat $(TOPDIR)/packages | grep -v '^#' | \ 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"; }' \ >> $(TOPDIR)/.depends # interpackage dependency generation diff --git a/dependencies.in b/dependencies.in index e00f269..deff7bb 100644 --- a/dependencies.in +++ b/dependencies.in @@ -31,25 +31,25 @@ depends LIBSQLITE_DEP config LIBSQLITE_INC_DIR string "LIBSQLITE include dir" depends LIBSQLITE_DEP 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 boolean "have libipkg v109 or greater" default "n" config LIBIPK_LIB_DIR string "libipkg library dir" depends LIBIPK_DEP |