summaryrefslogtreecommitdiff
Unidiff
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
@@ -32,14 +32,29 @@ all : $(TOPDIR)/.config
32# and then only the *.control files in this directory will be processed 32# and then only the *.control files in this directory will be processed
33ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config 33ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
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"; \
40 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); \ 40 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); \
41 done ) 41 done )
42 42
43ipks-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
56FORCE:
57
43$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 58$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
44 59
45all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 60all 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) :
6 6
7$(TOPDIR)/gen.pro : $(TOPDIR)/.config 7$(TOPDIR)/gen.pro : $(TOPDIR)/.config
8 echo > $@ 8 echo > $@
9# added for threaded version
10ifneq ($(CONFIG_THREADED),)
11 echo CONFIG += thread >> $@
12else
13 echo CONFIG -= thread >> $@
14endif
9ifneq ($(CONFIG_DEBUG),) 15ifneq ($(CONFIG_DEBUG),)
10 echo CONFIG += debug >> $@ 16 echo CONFIG += debug >> $@
11 echo CONFIG -= release >> $@ 17 echo CONFIG -= release >> $@
@@ -16,6 +22,7 @@ else
16 echo CONFIG += release >> $@ 22 echo CONFIG += release >> $@
17 echo DEFINES += "OPIE_NO_DEBUG" >> $@ 23 echo DEFINES += "OPIE_NO_DEBUG" >> $@
18endif 24endif
25
19ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 26ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
20 echo CONFIG -= qt3 >> $@ 27 echo CONFIG -= qt3 >> $@
21else 28else