author | kergoth <kergoth> | 2002-11-06 05:50:05 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 05:50:05 (UTC) |
commit | 915029461454cd28ee312948bbe7b4565d2173c0 (patch) (side-by-side diff) | |
tree | b0d1413cc56432b00bba713a03bdea2b51e0dcf9 | |
parent | afc4a200ea476e4cb5baa52bac8e11c9efd398c2 (diff) | |
download | opie-915029461454cd28ee312948bbe7b4565d2173c0.zip opie-915029461454cd28ee312948bbe7b4565d2173c0.tar.gz opie-915029461454cd28ee312948bbe7b4565d2173c0.tar.bz2 |
pass qmake var down
-rw-r--r-- | Rules.make | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -35,14 +35,14 @@ $(TOPDIR)/stamp-headers : ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) + ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h touch $@ $(TOPDIR)/library/custom.h : $(TOPDIR)/.config @-rm -f $@ - $(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ - ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@,\ - touch $@\ - ) + @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ + ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) + @touch $@ $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake : $(call descend,$(shell dirname $@),$(shell basename $@)) @@ -55,7 +55,7 @@ $(TOPDIR)/mkspecs/default : ## general rules ## define descend - $(MAKE) -C $(1) $(2) + $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) endef define makefilegen |