author | kergoth <kergoth> | 2003-04-22 20:21:20 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-22 20:21:20 (UTC) |
commit | e3ef0f8587b10bf242d8077609988e06a37bcae5 (patch) (unidiff) | |
tree | 89a270cdde36fdb406fa17f38be429a377545dd0 | |
parent | ccec87cf3e7192c0a3987aa3486668e89b1662a4 (diff) | |
download | opie-e3ef0f8587b10bf242d8077609988e06a37bcae5.zip opie-e3ef0f8587b10bf242d8077609988e06a37bcae5.tar.gz opie-e3ef0f8587b10bf242d8077609988e06a37bcae5.tar.bz2 |
Set strip binary appropriately, based on target selection for ipk creation
-rw-r--r-- | Makefile | 11 | ||||
-rw-r--r-- | Vars.make | 22 |
2 files changed, 23 insertions, 10 deletions
@@ -23,5 +23,3 @@ 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 \ |
@@ -109,9 +107,2 @@ 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) |
@@ -13,2 +13,6 @@ endif | |||
13 | 13 | ||
14 | ifneq ($(wildcard $(TOPDIR)/.config),) | ||
15 | include $(TOPDIR)/.config | ||
16 | endif | ||
17 | |||
14 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 18 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
@@ -63 +67,19 @@ export QTE_VERSION | |||
63 | export PATH:=$(OPIEDIR)/scripts:$(PATH) | 67 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
68 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) | ||
69 | |||
70 | ifdef CONFIG_OPTIMIZATIONS | ||
71 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) | ||
72 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) | ||
73 | endif | ||
74 | |||
75 | ifeq ($(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 | ||
85 | endif | ||