author | wimpie <wimpie> | 2004-04-02 18:34:55 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-04-02 18:34:55 (UTC) |
commit | 1d6b2100209fb63e737100c9f8f576bb26534e96 (patch) (unidiff) | |
tree | a622ace52548366a43f6a4712a9da2d95a81b6c5 | |
parent | 4ea2f227d3fb0d9591bb4f18555420ac47f3397d (diff) | |
download | opie-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
-rw-r--r-- | Makefile | 23 | ||||
-rw-r--r-- | Rules.make | 7 |
2 files changed, 26 insertions, 4 deletions
@@ -34,6 +34,6 @@ ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.con | |||
34 | @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ | 34 | @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ |
35 | prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ | 35 | prerm=`echo $${ctrl/.control/.prerm}`; \ |
36 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ | 36 | preinst=`echo $${ctrl/.control/.preinst}`; \ |
37 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ | 37 | postrm=`echo $${ctrl/.control/.postrm}`; \ |
38 | postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ | 38 | postinst=`echo $${ctrl/.control/.postinst}`; \ |
39 | echo "Building ipk of $$ctrl"; \ | 39 | echo "Building ipk of $$ctrl"; \ |
@@ -42,2 +42,17 @@ ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.con | |||
42 | 42 | ||
43 | ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config | ||
44 | @> $(OPIEDIR)/AllThreadedPackages | ||
45 | @find $(OPIEDIR)/ -type f -name \*.control | grep -v -- "-mt" | while read ctrl ; do \ | ||
46 | grep "Package[ ]*:" $${ctrl} | sed "s+Package[ ]*:[ ]*++"; \ | ||
47 | done | sort | uniq >> $(OPIEDIR)/AllThreadedPackages | ||
48 | @find $(OPIEDIR)/ -type f -name \*.control | while read ctrl ; do \ | ||
49 | echo "Converting $$ctrl to -mt package"; \ | ||
50 | nctrl=`$(OPIEDIR)/scripts/tothreaded $$ctrl $(OPIEDIR)/AllThreadedPackages`; \ | ||
51 | echo "Building ipk of $$ctrl"; \ | ||
52 | [ -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); \ | ||
53 | done | ||
54 | @rm -f $(OPIEDIR)/AllThreadedPackages | ||
55 | |||
56 | FORCE: | ||
57 | |||
43 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs | 58 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
@@ -8,2 +8,8 @@ $(TOPDIR)/gen.pro : $(TOPDIR)/.config | |||
8 | echo > $@ | 8 | echo > $@ |
9 | # added for threaded version | ||
10 | ifneq ($(CONFIG_THREADED),) | ||
11 | echo CONFIG += thread >> $@ | ||
12 | else | ||
13 | echo CONFIG -= thread >> $@ | ||
14 | endif | ||
9 | ifneq ($(CONFIG_DEBUG),) | 15 | ifneq ($(CONFIG_DEBUG),) |
@@ -18,2 +24,3 @@ else | |||
18 | endif | 24 | endif |
25 | |||
19 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 | 26 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |