projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a071a56
)
2003/09/28 02:02:58
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:38:31 +0000
(07:38 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:38:31 +0000
(07:38 +0000)
darcs-hash:
20040130073831
-2ba56-
382ed91d10e3398b7a9f97bab888e705fe06b64a
.gz
Makefile
patch
|
blob
|
history
Makefile.upstream
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
ae99cf4
..
14e2463
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-7,7
+7,7
@@
all: JVM Linux Win32 Darwin Solaris
clean:
all: JVM Linux Win32 Darwin Solaris
clean:
- rm -rf .jikes .configure* .install* build .compile
+ rm -rf .jikes .configure* .install* build .compile .build*
find upstream -name config.cache -exec rm {}\;
JVM: build/JVM/xwt.jar
find upstream -name config.cache -exec rm {}\;
JVM: build/JVM/xwt.jar
diff --git
a/Makefile.upstream
b/Makefile.upstream
index
620411c
..
aa3ae07
100644
(file)
--- a/
Makefile.upstream
+++ b/
Makefile.upstream
@@
-87,7
+87,7
@@
environment_jpeg-6b_$(target) += AR2=$(shell pwd)/upstream/install/$(t
# libmspack configury doesn't obey --target
environment_libmspack-20030726_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
environment_libmspack-20030726_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
# libmspack configury doesn't obey --target
environment_libmspack-20030726_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
environment_libmspack-20030726_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
-environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc"
+environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar"
environment_libmspack-20030726_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bin:$$PATH
environment_libmspack-20030726_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bin:$$PATH
@@
-124,22
+124,28
@@
vendor: .vendor; @true
$(configure_$*_$(target))
touch $@
$(configure_$*_$(target))
touch $@
-.install_libmspack-20030726_$(target): .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
-.configure_libmspack-20030726_$(target): .download_libmspack-20030726
+.configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
mkdir -p upstream/libmspack-20030726/build-$(target)
cd upstream/libmspack-20030726/build-$(target); ln -sf ../libmspack/mspack/* .
mkdir -p upstream/libmspack-20030726/build-$(target)
cd upstream/libmspack-20030726/build-$(target); ln -sf ../libmspack/mspack/* .
+ touch $@
+
+.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target)
+ touch $@
.install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../../install/bin make CC=mips-unknown-elf-gcc AR=mips-unknown-elf-ar
upstream/install/bin/mips-unknown-elf-ranlib upstream/freetype-2.1.4/src/objs/libfreetype.a
touch $@
.install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../../install/bin make CC=mips-unknown-elf-gcc AR=mips-unknown-elf-ar
upstream/install/bin/mips-unknown-elf-ranlib upstream/freetype-2.1.4/src/objs/libfreetype.a
touch $@
-.install_%_$(target): .configure_%_$(target)
+.build_%_$(target): .configure_%_$(target)
@echo -e "\n\033[1mbuilding $*...\033[0m"
cd upstream/$*/build-$(target); \
$(setcc) PATH=$$PATH:`pwd`/../../install/bin \
$(environment_$*_$(target)) \
make $(setcc) $(environment_$*_$(target))
@echo -e "\n\033[1mbuilding $*...\033[0m"
cd upstream/$*/build-$(target); \
$(setcc) PATH=$$PATH:`pwd`/../../install/bin \
$(environment_$*_$(target)) \
make $(setcc) $(environment_$*_$(target))
+ touch $@
+
+.install_%_$(target): .build_%_$(target)
@echo -e "\n\033[1minstalling $*...\033[0m"
cd upstream/$*/build-$(target); \
$(setcc) PATH=$$PATH:`pwd`/../../install/bin \
@echo -e "\n\033[1minstalling $*...\033[0m"
cd upstream/$*/build-$(target); \
$(setcc) PATH=$$PATH:`pwd`/../../install/bin \