summaryrefslogtreecommitdiff
authorwimpie <wimpie>2004-04-02 18:34:55 (UTC)
committer wimpie <wimpie>2004-04-02 18:34:55 (UTC)
commit1d6b2100209fb63e737100c9f8f576bb26534e96 (patch) (side-by-side diff)
treea622ace52548366a43f6a4712a9da2d95a81b6c5
parent4ea2f227d3fb0d9591bb4f18555420ac47f3397d (diff)
downloadopie-1d6b2100209fb63e737100c9f8f576bb26534e96.zip
opie-1d6b2100209fb63e737100c9f8f576bb26534e96.tar.gz
opie-1d6b2100209fb63e737100c9f8f576bb26534e96.tar.bz2
Added THREAD config flag (for compile agains threaded qt)
Added ipkg-mt target for packaging targets to -mt packages speedup of ipkg by using bash substitution instead of grep/sed
Diffstat (more/less context) (show 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
@@ -32,14 +32,29 @@ all : $(TOPDIR)/.config
# 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
diff --git a/Rules.make b/Rules.make
index c93d6ec..3f494ce 100644
--- a/Rules.make
+++ b/Rules.make
@@ -6,6 +6,12 @@ $(configs) :
$(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 >> $@
@@ -16,6 +22,7 @@ else
echo CONFIG += release >> $@
echo DEFINES += "OPIE_NO_DEBUG" >> $@
endif
+
ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
echo CONFIG -= qt3 >> $@
else