Gitweb links:
...log
http://git.netsurf-browser.org/squeeze.git/shortlog/d54d441f0b9a836ff5c44d17f0b479417fdad582
...commit
http://git.netsurf-browser.org/squeeze.git/commit/d54d441f0b9a836ff5c44d17f0b479417fdad582
...tree
http://git.netsurf-browser.org/squeeze.git/tree/d54d441f0b9a836ff5c44d17f0b479417fdad582
The branch, master has been updated
via d54d441f0b9a836ff5c44d17f0b479417fdad582 (commit)
from f26ccd671e8106f8cb73769d487c4c63e907a284 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/squeeze.git/commit/?id=d54d441f0b9a836ff5c44d17f0b479417fdad582
commit d54d441f0b9a836ff5c44d17f0b479417fdad582
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Update makefile for new tooling.
Stop assuming the location of the installed RISC OS tools. Infer
the objcopy binary name, rather than assuming it.
diff --git a/Makefile b/Makefile
index 2a19115..8ea7810 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,9 @@
# This makefile attempts to build a squeeze executable which can be used
# on Linux to compress RISC OS binaries.
-all: squeeze
+GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/arm-unknown-riscos/cross/bin
-PREFIX := /opt/netsurf/arm-unknown-riscos/cross
-
-install: squeeze
- mkdir -p $(DESTDIR)$(PREFIX)/bin
- install -m 755 squeeze $(DESTDIR)$(PREFIX)/bin/squeeze
-
-SDK_PATH = /opt/netsurf/arm-unknown-riscos/cross/bin/
+PREFIX ?= $(GCCSDK_INSTALL_CROSSBIN)/..
PERL ?= perl
export PERL
@@ -17,9 +11,17 @@ export PERL
MAKEHEADER = $(PERL) makeheader.pl
CC := gcc
+ASASM := $(GCCSDK_INSTALL_CROSSBIN)/asasm
+OBJCOPY := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*objcopy)
CFLAGS := $(CFLAGS) -O2
+all: squeeze
+
+install: squeeze
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ install -m 755 squeeze $(DESTDIR)$(PREFIX)/bin/squeeze
+
clean:
$(RM) squeeze squeeze.o unsqueeze.o unsqrm.o
$(RM) unsqueeze1.h unsqrm1.h unsqueeze.bin unsqrm.bin
@@ -27,7 +29,6 @@ clean:
distclean: clean
$(RM) *~
-
squeeze: squeeze.o
$(CC) $(CFLAGS) -o $@ $^
@@ -41,10 +42,10 @@ unsqueeze1.h: unsqueeze.bin
$(MAKEHEADER) UnSqueeze_UnSqueezeBase '' UnSqueeze_UnSqueezeLimit $< $@
unsqueeze.bin: unsqueeze.o
- $(SDK_PATH)arm-unknown-riscos-objcopy -O binary -j 'M2$$$$Code' $< $@
+ $(OBJCOPY) -O binary -j 'M2$$$$Code' $< $@
unsqrm.bin: unsqrm.o
- $(SDK_PATH)arm-unknown-riscos-objcopy -O binary -j unsqueeze $< $@
+ $(OBJCOPY) -O binary -j unsqueeze $< $@
%.o:%.s
- $(SDK_PATH)asasm -o $@ -elf -32 $<
+ $(ASASM) -o $@ -elf -32 $<
-----------------------------------------------------------------------
Summary of changes:
Makefile | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 2a19115..8ea7810 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,9 @@
# This makefile attempts to build a squeeze executable which can be used
# on Linux to compress RISC OS binaries.
-all: squeeze
+GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/arm-unknown-riscos/cross/bin
-PREFIX := /opt/netsurf/arm-unknown-riscos/cross
-
-install: squeeze
- mkdir -p $(DESTDIR)$(PREFIX)/bin
- install -m 755 squeeze $(DESTDIR)$(PREFIX)/bin/squeeze
-
-SDK_PATH = /opt/netsurf/arm-unknown-riscos/cross/bin/
+PREFIX ?= $(GCCSDK_INSTALL_CROSSBIN)/..
PERL ?= perl
export PERL
@@ -17,9 +11,17 @@ export PERL
MAKEHEADER = $(PERL) makeheader.pl
CC := gcc
+ASASM := $(GCCSDK_INSTALL_CROSSBIN)/asasm
+OBJCOPY := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*objcopy)
CFLAGS := $(CFLAGS) -O2
+all: squeeze
+
+install: squeeze
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ install -m 755 squeeze $(DESTDIR)$(PREFIX)/bin/squeeze
+
clean:
$(RM) squeeze squeeze.o unsqueeze.o unsqrm.o
$(RM) unsqueeze1.h unsqrm1.h unsqueeze.bin unsqrm.bin
@@ -27,7 +29,6 @@ clean:
distclean: clean
$(RM) *~
-
squeeze: squeeze.o
$(CC) $(CFLAGS) -o $@ $^
@@ -41,10 +42,10 @@ unsqueeze1.h: unsqueeze.bin
$(MAKEHEADER) UnSqueeze_UnSqueezeBase '' UnSqueeze_UnSqueezeLimit $< $@
unsqueeze.bin: unsqueeze.o
- $(SDK_PATH)arm-unknown-riscos-objcopy -O binary -j 'M2$$$$Code' $< $@
+ $(OBJCOPY) -O binary -j 'M2$$$$Code' $< $@
unsqrm.bin: unsqrm.o
- $(SDK_PATH)arm-unknown-riscos-objcopy -O binary -j unsqueeze $< $@
+ $(OBJCOPY) -O binary -j unsqueeze $< $@
%.o:%.s
- $(SDK_PATH)asasm -o $@ -elf -32 $<
+ $(ASASM) -o $@ -elf -32 $<
--
Linux buildable port of the Squeeze binary for RISC OS
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
