|
diff --git a/Makefile b/Makefile index 10df035..8551f28 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -16,19 +16,17 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD |
16 | # everything else depends on .depends, to ensure the dependencies are |
16 | # everything else depends on .depends, to ensure the dependencies are |
17 | # intact. |
17 | # intact. |
18 | # |
18 | # |
19 | # NOTE: The order in which things happen in this makefile is |
19 | # NOTE: The order in which things happen in this makefile is |
20 | # -critical-. Do not rearrange this! |
20 | # -critical-. Do not rearrange this! |
21 | |
21 | |
22 | all : $(TOPDIR)/.config |
22 | all : $(TOPDIR)/.config |
23 | |
23 | |
24 | STRIP=arm-linux-strip |
24 | ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config |
25 | |
| |
26 | ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE |
| |
27 | @find $(OPIEDIR)/ -type f -name \*.control | ( for ctrl in `cat`; do \ |
25 | @find $(OPIEDIR)/ -type f -name \*.control | ( for ctrl in `cat`; do \ |
28 | prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ |
26 | prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ |
29 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ |
27 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ |
30 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ |
28 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ |
31 | postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ |
29 | postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ |
32 | echo "Building ipk of $$ctrl"; \ |
30 | echo "Building ipk of $$ctrl"; \ |
33 | 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); \ |
31 | 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); \ |
34 | done ) |
32 | done ) |
@@ -102,23 +100,16 @@ export include-config := 1 |
102 | -include $(TOPDIR)/.config |
100 | -include $(TOPDIR)/.config |
103 | -include $(TOPDIR)/.depends |
101 | -include $(TOPDIR)/.depends |
104 | endif |
102 | endif |
105 | |
103 | |
106 | -include $(TOPDIR)/.config.cmd |
104 | -include $(TOPDIR)/.config.cmd |
107 | |
105 | |
108 | SUBDIRS = $(subdir-y) |
106 | SUBDIRS = $(subdir-y) |
109 | |
107 | |
110 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
| |
111 | |
| |
112 | ifdef CONFIG_OPTIMIZATIONS |
| |
113 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
| |
114 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
| |
115 | endif |
| |
116 | |
| |
117 | all clean install ipk: $(SUBDIRS) |
108 | all clean install ipk: $(SUBDIRS) |
118 | |
109 | |
119 | lupdate lrelease: |
110 | lupdate lrelease: |
120 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; |
111 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; |
121 | |
112 | |
122 | opie-lupdate opie-lrelease: |
113 | opie-lupdate opie-lrelease: |
123 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; |
114 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; |
124 | |
115 | |
|