author | wimpie <wimpie> | 2004-08-25 22:25:49 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-08-25 22:25:49 (UTC) |
commit | 9c679b7a9cff346175b012cb1634dc2161b95889 (patch) (unidiff) | |
tree | 6720cdc562129c7b55ffdf30517c80dfd721eea9 | |
parent | a64c92819cd3106584d9005e42ed972726081a94 (diff) | |
download | opie-9c679b7a9cff346175b012cb1634dc2161b95889.zip opie-9c679b7a9cff346175b012cb1634dc2161b95889.tar.gz opie-9c679b7a9cff346175b012cb1634dc2161b95889.tar.bz2 |
makefilegen :
changed the command to generate the makefile from a pro-file
and removed the 6 processes that need to be started
(2 shell, cat grep head awk and sed)
to
one shell
and some makefile commands
-rw-r--r-- | Rules.make | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -53,6 +53,9 @@ endif | |||
53 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) | 53 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
54 | echo CONFIG += no-override >> $@ | 54 | echo CONFIG += no-override >> $@ |
55 | endif | 55 | endif |
56 | ifeq ($(CONFIG_OPIELOGIN_USEPAM),y) | ||
57 | echo CONFIG += OPIELOGIN_USEPAM >> $@ | ||
58 | endif | ||
56 | ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) | 59 | ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) |
57 | echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ | 60 | echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ |
58 | endif | 61 | endif |
@@ -307,8 +310,7 @@ define descend | |||
307 | endef | 310 | endef |
308 | 311 | ||
309 | define makefilegen | 312 | define makefilegen |
310 | cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \ | 313 | cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep -m 1 "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages)) |
311 | head -1 | awk '{print $$3}'` | ||
312 | endef | 314 | endef |
313 | 315 | ||
314 | define makecfg | 316 | define makecfg |