will descend into dirs that dont have .lpro files now

1 files changed, 8 insertions, 8 deletions

diff --git a/Rules.make b/Rules.make
index 4e2a6c5..ead629f 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,30 +1,30 @@
 ## targets ##
 
 $(configs) :
         $(call makecfg,$@)
 
 $(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 | \
-                awk '/^#/ { next }; {print \
+        cat $(TOPDIR)/packages | grep -v '^#' | \
+                awk '{print \
                         ".PHONY : " $$2 "\n" \
-                        "subdir-$$(" $$1 ") += " $$2 "\n\n" \
-                        $$2 "/Makefile : " $$2 "/" $$3 " $$(TOPDIR)/qmake/qmake\n\t" \
-                        "$$(call makefilegen,$$@)\n\n" \
-                        $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\
-                        > $(TOPDIR)/.depends
+                        "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
+                        print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\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 \$$(TOPDIR)/qmake/qmake\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
+                        >> $(TOPDIR)/.depends
 # interpackage dependency generation
-        @cat $(TOPDIR)/packages | \
+        cat $(TOPDIR)/packages | \
                 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
 
 $(TOPDIR)/.depends.cfgs:
 # config.in interdependencies
         @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
         @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 ) >> $@
         @-rm -f dirs
 
 $(TOPDIR)/stamp-headers :
         mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
                 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
         ( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )