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

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
@@ -8,96 +8,99 @@ $(TOPDIR)/gen.pro : $(TOPDIR)/.config
 	echo > $@
 # added for threaded version
 ifneq ($(CONFIG_THREADED),)
 	echo CONFIG += thread >> $@
 else
 	echo CONFIG -= thread >> $@
 endif
 ifneq ($(CONFIG_DEBUG),)
 	echo CONFIG += debug >> $@
 	echo CONFIG -= release >> $@
 	echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@
 	echo DEFINES += QT_DEBUG >> $@
 else
 	echo CONFIG -= debug >> $@
 	echo CONFIG += release >> $@
 	echo DEFINES += "OPIE_NO_DEBUG" >> $@
 endif
 ifeq ($(CONFIG_STATIC),y)
 	echo !contains\( TARGET,qpe \) \{ >> $@
 	echo CONFIG += staticlib >> $@
 	echo \} >> $@
 endif
 ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
 	echo CONFIG -= qt3 >> $@
 else
 	echo CONFIG += qt3 >> $@
 endif
 ifneq ($(CONFIG_QUICK_LAUNCH),)
 	echo contains\( CONFIG, quick-app \) \{ >> $@
 	echo CONFIG -= staticlib >> $@
 	echo CONFIG -= quick-app >> $@
 	echo CONFIG += quick-app-lib >> $@
 	echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
 	echo \} >> $@
 else
 	echo contains\( CONFIG, quick-app \) \{ >> $@
 	echo CONFIG -= quick-app >> $@
 	echo CONFIG += quick-app-bin >> $@
 	echo \} >> $@
 endif
 ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
 	echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
 else
 	echo ENABLE_SQL_PIM_BACKEND=n >> $@
 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
 ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
 	echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
 	echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
 	echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
 endif
 ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
 	echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
 endif
 ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
 	echo DEFINES += USE_FILE_NOTIFICATION >> $@
 endif
 ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
 	echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
 endif
 ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
 	echo DEFINES += OPIE_NEW_MALLOC >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
 	echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
 endif
 	echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
 ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
 	echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
 endif
 ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y)
 	echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@
 endif	
 # Write LIB dirs and INC dirs...
 ifeq ($(CONFIG_LIBETPAN_DEP),y)
 	echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
 	echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBPCAP_DEP),y)
 	echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@
 	echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSQLITE_DEP),y)
 	echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
 	echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBXINE_DEP),y)
@@ -262,55 +265,54 @@ defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
 	$(TOPDIR)/scripts/kconfig/conf -d ./config.in
 	@touch .config.stamp
 
 $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
 
 $(TOPDIR)/mkspecs/default :
 	ln -sf linux-g++ $@
 
 $(TOPDIR)/scripts/subst : force
 	@( \
 		echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
 		echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
 		echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
 		echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
 		echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
 		echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
 		echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
 	) > $@ || ( rm -f $@; exit 1 )
 
 $(TOPDIR)/scripts/filesubst : force
 	@( \
 		echo 's,\$$OPIEDIR/root/,/,g'; \
 		echo 's,$(OPIEDIR)/root/,/,g'; \
 		echo 's,\$$OPIEDIR,$(prefix),g'; \
 		echo 's,$(OPIEDIR),$(prefix),g'; \
 		echo 's,\$$QTDIR,$(prefix),g'; \
 		echo 's,$(QTDIR),$(prefix),g'; \
 		echo 's,^\(\./\)*root/,/,g'; \
 		echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
 		echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
 		echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
 		echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
 		echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
 		echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
 		echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
 		echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
 		echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \
 		echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
 		echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \
 	) > $@ || ( rm -f $@; exit 1 )
 
 ## general rules ##
 
 define descend
 	$(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
 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
 	$(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
 endef