|
|
|
@@ -44,24 +44,27 @@ else |
44 | echo CONFIG -= quick-app >> $@ |
44 | echo CONFIG -= quick-app >> $@ |
45 | echo CONFIG += quick-app-bin >> $@ |
45 | echo CONFIG += quick-app-bin >> $@ |
46 | echo \} >> $@ |
46 | echo \} >> $@ |
47 | endif |
47 | endif |
48 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) |
48 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) |
49 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ |
49 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ |
50 | else |
50 | else |
51 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ |
51 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ |
52 | endif |
52 | 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 |
59 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) |
62 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) |
60 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ |
63 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ |
61 | endif |
64 | endif |
62 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
65 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
63 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
66 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
64 | endif |
67 | endif |
65 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) |
68 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) |
66 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ |
69 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ |
67 | endif |
70 | endif |
@@ -298,19 +301,18 @@ $(TOPDIR)/scripts/filesubst : force |
298 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ |
301 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ |
299 | echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ |
302 | echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ |
300 | echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ |
303 | echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ |
301 | ) > $@ || ( rm -f $@; exit 1 ) |
304 | ) > $@ || ( rm -f $@; exit 1 ) |
302 | |
305 | |
303 | ## general rules ## |
306 | ## general rules ## |
304 | |
307 | |
305 | define descend |
308 | define descend |
306 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
309 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
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 |
315 | $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) |
317 | $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) |
316 | endef |
318 | endef |
|