author | clem <clem> | 2004-10-14 20:30:23 (UTC) |
---|---|---|
committer | clem <clem> | 2004-10-14 20:30:23 (UTC) |
commit | d4bace84a2abfd1b4b242c24258961d093e38054 (patch) (unidiff) | |
tree | 1a18d97587de072dedfb0f6856c39c5f4086f205 | |
parent | 686f3265f6a39144692b1a6360159df96dd0b41e (diff) | |
download | opie-d4bace84a2abfd1b4b242c24258961d093e38054.zip opie-d4bace84a2abfd1b4b242c24258961d093e38054.tar.gz opie-d4bace84a2abfd1b4b242c24258961d093e38054.tar.bz2 |
allow distribution inside *one* single directory, +ing the call descend as in the previous commit
-rw-r--r-- | Rules.make | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -113,33 +113,33 @@ ifeq ($(CONFIG_LIBIPK_DEP),y) | |||
113 | endif | 113 | endif |
114 | ifeq ($(CONFIG_LIBSDK_DEP),y) | 114 | ifeq ($(CONFIG_LIBSDK_DEP),y) |
115 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ | 115 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ |
116 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ | 116 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ |
117 | endif | 117 | endif |
118 | ifeq ($(CONFIG_LIBSWORD_DEP),y) | 118 | ifeq ($(CONFIG_LIBSWORD_DEP),y) |
119 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ | 119 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ |
120 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ | 120 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ |
121 | endif | 121 | endif |
122 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages | 122 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages |
123 | @echo Generating dependency information... | 123 | @echo Generating dependency information... |
124 | # add to subdir-y, and add descend rules | 124 | # add to subdir-y, and add descend rules |
125 | @cat $(TOPDIR)/packages | grep -v '^#' | \ | 125 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
126 | awk '{print \ | 126 | awk '{print \ |
127 | ".PHONY : " $$2 "\n" \ | 127 | ".PHONY : " $$2 "\n" \ |
128 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ | 128 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ |
129 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends | 129 | print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends |
130 | cat $(TOPDIR)/packages | grep -v '^#' | \ | 130 | cat $(TOPDIR)/packages | grep -v '^#' | \ |
131 | 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"; }' \ | 131 | 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"; }' \ |
132 | >> $(TOPDIR)/.depends | 132 | >> $(TOPDIR)/.depends |
133 | # interpackage dependency generation | 133 | # interpackage dependency generation |
134 | @cat $(TOPDIR)/packages | \ | 134 | @cat $(TOPDIR)/packages | \ |
135 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends | 135 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends |
136 | 136 | ||
137 | $(TOPDIR)/.depends.cfgs: | 137 | $(TOPDIR)/.depends.cfgs: |
138 | # config.in interdependencies | 138 | # config.in interdependencies |
139 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs | 139 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs |
140 | @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ | 140 | @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ |
141 | @-rm -f dirs | 141 | @-rm -f dirs |
142 | 142 | ||
143 | $(QTDIR)/stamp-headers : | 143 | $(QTDIR)/stamp-headers : |
144 | @-rm -f $(QTDIR)/stamp-headers* | 144 | @-rm -f $(QTDIR)/stamp-headers* |
145 | ( cd $(QTDIR)/include; \ | 145 | ( cd $(QTDIR)/include; \ |