summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile23
-rw-r--r--Rules.make7
2 files changed, 26 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c35af72..2052ea9 100644
--- a/Makefile
+++ b/Makefile
@@ -23,32 +23,47 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD
# NOTE: The order in which things happen in this makefile is
# -critical-. Do not rearrange this!
all : $(TOPDIR)/.config
#
# The IPK creation is a very slow process. If you want to only create some
# IPKs, e.g. the ones in library, then do
# make ipks IPK_START=library
# and then only the *.control files in this directory will be processed
ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
@find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \
- prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \
- preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \
- postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \
- postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \
+ prerm=`echo $${ctrl/.control/.prerm}`; \
+ preinst=`echo $${ctrl/.control/.preinst}`; \
+ postrm=`echo $${ctrl/.control/.postrm}`; \
+ postinst=`echo $${ctrl/.control/.postinst}`; \
echo "Building ipk of $$ctrl"; \
cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \
done )
+ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
+ @> $(OPIEDIR)/AllThreadedPackages
+ @find $(OPIEDIR)/ -type f -name \*.control | grep -v -- "-mt" | while read ctrl ; do \
+ grep "Package[ ]*:" $${ctrl} | sed "s+Package[ ]*:[ ]*++"; \
+ done | sort | uniq >> $(OPIEDIR)/AllThreadedPackages
+ @find $(OPIEDIR)/ -type f -name \*.control | while read ctrl ; do \
+ echo "Converting $$ctrl to -mt package"; \
+ nctrl=`$(OPIEDIR)/scripts/tothreaded $$ctrl $(OPIEDIR)/AllThreadedPackages`; \
+ echo "Building ipk of $$ctrl"; \
+ [ -n $$nctrl ] && cd $(OPIEDIR) && $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$nctrl --prerm=$${nctrl/\.control$$/.prerm/} --preinst=$${nctrl/\.control$$/.preinst/} --postrm=$${nctrl/\.control$$/.postrm/} --postinst=$${nctrl/\.control$$/.postinst/} --strip=$(STRIP) $(OPIEDIR); \
+ done
+ @rm -f $(OPIEDIR)/AllThreadedPackages
+
+FORCE:
+
$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
clean-configs :
@echo "Wiping generated config.in files..."
@-rm -f $(configs)
ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),)
include $(TOPDIR)/.depends.cfgs
endif
diff --git a/Rules.make b/Rules.make
index c93d6ec..3f494ce 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,30 +1,37 @@
.phony: force
force:
$(configs) :
$(call makecfg,$@)
$(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 ($(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 -= quick-app >> $@
echo CONFIG += quick-app-lib >> $@
echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
echo \} >> $@
else