summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-22 20:21:20 (UTC)
committer kergoth <kergoth>2003-04-22 20:21:20 (UTC)
commite3ef0f8587b10bf242d8077609988e06a37bcae5 (patch) (unidiff)
tree89a270cdde36fdb406fa17f38be429a377545dd0
parentccec87cf3e7192c0a3987aa3486668e89b1662a4 (diff)
downloadopie-e3ef0f8587b10bf242d8077609988e06a37bcae5.zip
opie-e3ef0f8587b10bf242d8077609988e06a37bcae5.tar.gz
opie-e3ef0f8587b10bf242d8077609988e06a37bcae5.tar.bz2
Set strip binary appropriately, based on target selection for ipk creation
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
@@ -21,9 +21,7 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD
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,'`; \
@@ -107,13 +105,6 @@ endif
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:
diff --git a/Vars.make b/Vars.make
index eac5cea..b1cdb28 100644
--- a/Vars.make
+++ b/Vars.make
@@ -11,6 +11,10 @@ ifeq ($(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
@@ -61,3 +65,21 @@ endif
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