summaryrefslogtreecommitdiff
authorwimpie <wimpie>2004-08-25 22:25:49 (UTC)
committer wimpie <wimpie>2004-08-25 22:25:49 (UTC)
commit9c679b7a9cff346175b012cb1634dc2161b95889 (patch) (side-by-side diff)
tree6720cdc562129c7b55ffdf30517c80dfd721eea9
parenta64c92819cd3106584d9005e42ed972726081a94 (diff)
downloadopie-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
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make6
1 files changed, 4 insertions, 2 deletions
diff --git a/Rules.make b/Rules.make
index e8b2420..f68fa3b 100644
--- a/Rules.make
+++ b/Rules.make
@@ -53,6 +53,9 @@ endif
ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
echo CONFIG += no-override >> $@
endif
+ifeq ($(CONFIG_OPIELOGIN_USEPAM),y)
+ echo CONFIG += OPIELOGIN_USEPAM >> $@
+endif
ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
endif
@@ -307,8 +310,7 @@ define descend
endef
define makefilegen
- 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$$,,'\` " | \
- head -1 | awk '{print $$3}'`
+ 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))
endef
define makecfg