diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-28 00:59:11 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-28 00:59:11 +0000 |
commit | 35a0b2c9104c08c0288cc8d11206805b6af26aaa (patch) | |
tree | 640df61146cc1c8b3b108b10bb417995feed2003 | |
parent | 9b9112bd7c9e844854aa826e1a328002a8de967b (diff) | |
download | netsurf-35a0b2c9104c08c0288cc8d11206805b6af26aaa.tar.gz netsurf-35a0b2c9104c08c0288cc8d11206805b6af26aaa.tar.bz2 |
Revert accidental commit
svn path=/trunk/netsurf/; revision=6952
-rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -376,7 +376,7 @@ ifeq ($(TARGET),riscos) # Go for static builds & AIF binary at the moment: CFLAGS += -static LDFLAGS += -static -# EXEEXT := ,ff8 + EXEEXT := ,ff8 endif endif endif @@ -632,13 +632,13 @@ OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsu $(EXETARGET): $(OBJECTS) $(RESOURCES) $(VQ)echo " LINK: $(EXETARGET)" -#ifneq ($(TARGET)$(SUBTARGET),riscos-elf) +ifneq ($(TARGET)$(SUBTARGET),riscos-elf) $(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS) -#else -# $(Q)$(CC) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS) -# $(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET) -# $(Q)$(RM) $(EXETARGET:,ff8=,e1f) -#endif +else + $(Q)$(CC) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS) + $(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET) + $(Q)$(RM) $(EXETARGET:,ff8=,e1f) +endif ifeq ($(NETSURF_STRIP_BINARY),YES) $(VQ)echo " STRIP: $(EXETARGET)" $(Q)$(STRIP) $(EXETARGET) |