summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile11
-rw-r--r--Vars.make22
2 files changed, 23 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 10df035..8551f28 100644
--- a/Makefile
+++ b/Makefile
@@ -18,15 +18,13 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD
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
22all : $(TOPDIR)/.config 22all : $(TOPDIR)/.config
23 23
24STRIP=arm-linux-strip 24ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
25
26ipks: $(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"; \
@@ -104,19 +102,12 @@ export include-config := 1
104endif 102endif
105 103
106-include $(TOPDIR)/.config.cmd 104-include $(TOPDIR)/.config.cmd
107 105
108SUBDIRS = $(subdir-y) 106SUBDIRS = $(subdir-y)
109 107
110export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
111
112ifdef CONFIG_OPTIMIZATIONS
113export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
114export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
115endif
116
117all clean install ipk: $(SUBDIRS) 108all clean install ipk: $(SUBDIRS)
118 109
119lupdate lrelease: 110lupdate lrelease:
120 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; 111 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
121 112
122opie-lupdate opie-lrelease: 113opie-lupdate opie-lrelease:
diff --git a/Vars.make b/Vars.make
index eac5cea..b1cdb28 100644
--- a/Vars.make
+++ b/Vars.make
@@ -8,12 +8,16 @@ ifeq ($(OPIEDIR),)
8 export OPIEDIR:=$(TOPDIR) 8 export OPIEDIR:=$(TOPDIR)
9endif 9endif
10ifeq ($(IPK_DIR),) 10ifeq ($(IPK_DIR),)
11 export IPK_DIR:=$(OPIEDIR) 11 export IPK_DIR:=$(OPIEDIR)
12endif 12endif
13 13
14ifneq ($(wildcard $(TOPDIR)/.config),)
15 include $(TOPDIR)/.config
16endif
17
14export QMAKE:=$(OPIEDIR)/qmake/qmake 18export QMAKE:=$(OPIEDIR)/qmake/qmake
15export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 19export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
16 20
17ifeq ($(QPE_VERSION),) 21ifeq ($(QPE_VERSION),)
18 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 22 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
19 VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 23 VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
@@ -58,6 +62,24 @@ ifeq ($(QTE_VERSION),)
58 QTE_VERSION=2.3.5 62 QTE_VERSION=2.3.5
59 endif 63 endif
60endif 64endif
61export QTE_VERSION 65export QTE_VERSION
62 66
63export PATH:=$(OPIEDIR)/scripts:$(PATH) 67export PATH:=$(OPIEDIR)/scripts:$(PATH)
68export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
69
70ifdef CONFIG_OPTIMIZATIONS
71export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
72export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
73endif
74
75ifeq ($(STRIP),)
76 ifneq ($(CONFIG_TARGET_X86),)
77 STRIP=strip
78 endif
79 ifneq ($(CONFIG_TARGET_IPAQ),)
80 STRIP=arm-linux-strip
81 endif
82 ifneq ($(CONFIG_TARGET_SHARP),)
83 STRIP=arm-linux-strip
84 endif
85endif