r5458 joty - in /trunk: hubbub/Makefile hubbub/Makefile-riscos libnsbmp/Makefile libnsgif/Makefile libparserutils/Makefile-riscos libsvgtiny/makefile pencil/makefile rufl/makefile

netsurf at semichrome.net netsurf at semichrome.net
Sun Sep 28 21:35:58 BST 2008


Author: joty
Date: Sun Sep 28 15:35:57 2008
New Revision: 5458

URL: http://source.netsurf-browser.org?rev=5458&view=rev
Log:
GCCSDK 4 build compatibility (not finished yet)

Modified:
    trunk/hubbub/Makefile
    trunk/hubbub/Makefile-riscos
    trunk/libnsbmp/Makefile
    trunk/libnsgif/Makefile
    trunk/libparserutils/Makefile-riscos
    trunk/libsvgtiny/makefile
    trunk/pencil/makefile
    trunk/rufl/makefile

Modified: trunk/hubbub/Makefile
URL: http://source.netsurf-browser.org/trunk/hubbub/Makefile?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/hubbub/Makefile (original)
+++ trunk/hubbub/Makefile Sun Sep 28 15:35:57 2008
@@ -21,7 +21,7 @@
 WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wnested-externs -Werror -pedantic
-CFLAGS += -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS)
+CFLAGS = -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS)
 RELEASECFLAGS = $(CFLAGS) -DNDEBUG -O2
 DEBUGCFLAGS = $(CFLAGS) -O0 -g
 ARFLAGS := -cru

Modified: trunk/hubbub/Makefile-riscos
URL: http://source.netsurf-browser.org/trunk/hubbub/Makefile-riscos?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/hubbub/Makefile-riscos (original)
+++ trunk/hubbub/Makefile-riscos Sun Sep 28 15:35:57 2008
@@ -2,9 +2,9 @@
 GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
 GCCSDK_INSTALL_ENV ?= /home/riscos/env
 
-CC := $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR := $(GCCSDK_INSTALL_CROSSBIN)/ar
-LD := $(GCCSDK_INSTALL_CROSSBIN)/gcc
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+LD := $(CC)
 
 CP := cp
 RM := rm
@@ -16,15 +16,15 @@
 PKGCONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
 INSTALL := install
 SED := sed
+TOUCH := touch
 LCOV := echo
 GENHTML := echo
-TOUCH := touch
 
 # Toolchain flags
 WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wnested-externs -Werror -pedantic
-CFLAGS += -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS) \
+CFLAGS = -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS) \
 	-mpoke-function-name
 RELEASECFLAGS = $(CFLAGS) -DNDEBUG -O2
 DEBUGCFLAGS = $(CFLAGS) -O0 -g
@@ -40,7 +40,11 @@
 PKGCONFIGFLAGS :=
 TOUCHFLAGS :=
 
-EXEEXT := ,ff8
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+  EXEEXT := ,e1f
+else
+  EXEEXT := ,ff8
+endif
 
 # Default installation prefix
 PREFIX ?= $(GCCSDK_INSTALL_ENV)

Modified: trunk/libnsbmp/Makefile
URL: http://source.netsurf-browser.org/trunk/libnsbmp/Makefile?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/libnsbmp/Makefile (original)
+++ trunk/libnsbmp/Makefile Sun Sep 28 15:35:57 2008
@@ -18,29 +18,29 @@
 DOXYGEN = doxygen
 
 ifeq ($(TARGET),riscos)
-GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+  GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+  GCCSDK_INSTALL_ENV ?= /home/riscos/env
+  CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+  AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+  CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
+  LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
+  ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+    EXEEXT := ,e1f
+    SUBTARGET := -elf-
+  else
+    EXEEXT := ,ff8
+    SUBTARGET := -aof-
+  endif
+  PREFIX = $(GCCSDK_INSTALL_ENV)
 else
-CFLAGS += -g
-LIBS =
-PREFIX = /usr/local
+  CFLAGS += -g
+  LIBS =
+  PREFIX = /usr/local
 endif
 
-ifeq ($(TARGET),)
-OBJDIR = objects
-LIBDIR = lib
-BINDIR = bin
-else
-OBJDIR = $(TARGET)-objects
-LIBDIR = $(TARGET)-lib
-BINDIR = $(TARGET)-bin
-endif
+OBJDIR = $(TARGET)$(SUBTARGET)objects
+LIBDIR = $(TARGET)$(SUBTARGET)lib
+BINDIR = $(TARGET)$(SUBTARGET)bin
 
 OBJS = $(addprefix $(OBJDIR)/, $(SOURCE:.c=.o))
 

Modified: trunk/libnsgif/Makefile
URL: http://source.netsurf-browser.org/trunk/libnsgif/Makefile?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/libnsgif/Makefile (original)
+++ trunk/libnsgif/Makefile Sun Sep 28 15:35:57 2008
@@ -18,29 +18,29 @@
 DOXYGEN = doxygen
 
 ifeq ($(TARGET),riscos)
-GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+  GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+  GCCSDK_INSTALL_ENV ?= /home/riscos/env
+  CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+  AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+  CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
+  LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
+  ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+    EXEEXT := ,e1f
+    SUBTARGET := -elf-
+  else
+    EXEEXT := ,ff8
+    SUBTARGET := -aof-
+  endif
+  PREFIX = $(GCCSDK_INSTALL_ENV)
 else
-CFLAGS += -g
-LIBS =
-PREFIX = /usr/local
+  CFLAGS += -g
+  LIBS =
+  PREFIX = /usr/local
 endif
 
-ifeq ($(TARGET),)
-OBJDIR = objects
-LIBDIR = lib
-BINDIR = bin
-else
-OBJDIR = $(TARGET)-objects
-LIBDIR = $(TARGET)-lib
-BINDIR = $(TARGET)-bin
-endif
+OBJDIR = $(TARGET)$(SUBTARGET)objects
+LIBDIR = $(TARGET)$(SUBTARGET)lib
+BINDIR = $(TARGET)$(SUBTARGET)bin
 
 OBJS = $(addprefix $(OBJDIR)/, $(SOURCE:.c=.o))
 

Modified: trunk/libparserutils/Makefile-riscos
URL: http://source.netsurf-browser.org/trunk/libparserutils/Makefile-riscos?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/libparserutils/Makefile-riscos (original)
+++ trunk/libparserutils/Makefile-riscos Sun Sep 28 15:35:57 2008
@@ -2,9 +2,9 @@
 GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
 GCCSDK_INSTALL_ENV ?= /home/riscos/env
 
-CC := $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR := $(GCCSDK_INSTALL_CROSSBIN)/ar
-LD := $(GCCSDK_INSTALL_CROSSBIN)/gcc
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+LD := $(CC)
 
 CP := cp
 RM := rm
@@ -40,7 +40,11 @@
 PKGCONFIGFLAGS :=
 TOUCHFLAGS :=
 
-EXEEXT := ,ff8
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+  EXEEXT := ,e1f
+else
+  EXEEXT := ,ff8
+endif
 
 # Default installation prefix
 PREFIX ?= $(GCCSDK_INSTALL_ENV)

Modified: trunk/libsvgtiny/makefile
URL: http://source.netsurf-browser.org/trunk/libsvgtiny/makefile?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/libsvgtiny/makefile (original)
+++ trunk/libsvgtiny/makefile Sun Sep 28 15:35:57 2008
@@ -16,30 +16,30 @@
 INSTALL = install
 
 ifeq ($(TARGET),riscos)
-GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include \
+  GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+  GCCSDK_INSTALL_ENV ?= /home/riscos/env
+  CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+  AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+  CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include \
 	-I$(GCCSDK_INSTALL_ENV)/include/libxml2
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+  LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz
+  ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+    EXEEXT := ,e1f
+    SUBTARGET := -elf-
+  else
+    EXEEXT := ,ff8
+    SUBTARGET := -aof-
+  endif
+  PREFIX = $(GCCSDK_INSTALL_ENV)
 else
-CFLAGS += -g `xml2-config --cflags` -fgnu89-inline
-LIBS = `xml2-config --libs`
-PREFIX = /usr/local
+  CFLAGS += -g `xml2-config --cflags` -fgnu89-inline
+  LIBS = `xml2-config --libs`
+  PREFIX = /usr/local
 endif
 
-ifeq ($(TARGET),)
-OBJDIR = objects
-LIBDIR = lib
-BINDIR = bin
-else
-OBJDIR = $(TARGET)-objects
-LIBDIR = $(TARGET)-lib
-BINDIR = $(TARGET)-bin
-endif
+OBJDIR = $(TARGET)$(SUBTARGET)objects
+LIBDIR = $(TARGET)$(SUBTARGET)lib
+BINDIR = $(TARGET)$(SUBTARGET)bin
 
 OBJS = $(addprefix $(OBJDIR)/, $(SOURCE:.c=.o))
 

Modified: trunk/pencil/makefile
URL: http://source.netsurf-browser.org/trunk/pencil/makefile?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/pencil/makefile (original)
+++ trunk/pencil/makefile Sun Sep 28 15:35:57 2008
@@ -11,21 +11,10 @@
 GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
 GCCSDK_INSTALL_ENV ?= /home/riscos/env
 
-ifeq (${AB_ELFBUILD},yes)
-EXEEXT=,e1f
-else
-EXEEXT=,ff8
-endif
-
 .PHONY: all install clean
 
-ifeq (${AB_ELFBUILD},yes)
-CC = $(GCCSDK_INSTALL_CROSSBIN)/arm-unknown-riscos-gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/arm-unknown-riscos-ar
-else
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-endif
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
 CFLAGS = -std=c99 -O3 -W -Wall -Wundef -Wpointer-arith -Wcast-qual \
 	-Wcast-align -Wwrite-strings -Wstrict-prototypes \
 	-Wmissing-prototypes -Wmissing-declarations \
@@ -34,6 +23,11 @@
 ARFLAGS = cr
 LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lOSLib32 -lrufl
 INSTALL = $(GCCSDK_INSTALL_ENV)/ro-install
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+  EXEEXT=,e1f
+else
+  EXEEXT=,ff8
+endif
 
 OBJS = $(SOURCE:.c=.o)
 

Modified: trunk/rufl/makefile
URL: http://source.netsurf-browser.org/trunk/rufl/makefile?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/rufl/makefile (original)
+++ trunk/rufl/makefile Sun Sep 28 15:35:57 2008
@@ -16,25 +16,14 @@
 	rufl_find.c rufl_decompose.c rufl_metrics.c
 HDRS = rufl.h rufl_internal.h
 
-ifeq (${AB_ELFBUILD},yes)
-EXEEXT=,e1f
-else
-EXEEXT=,ff8
-endif
-
 .PHONY: all install clean
 
 ifeq ($(COMPILER), gcc)
 # cross-compiling using GCCSDK
 GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
 GCCSDK_INSTALL_ENV ?= /home/riscos/env
-ifeq (${AB_ELFBUILD},yes)
-CC = $(GCCSDK_INSTALL_CROSSBIN)/arm-unknown-riscos-gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/arm-unknown-riscos-ar
-else
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-endif
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
 CFLAGS = -std=c99 -O3 -W -Wall -Wundef -Wpointer-arith -Wcast-qual \
 	-Wcast-align -Wwrite-strings -Wstrict-prototypes \
 	-Wmissing-prototypes -Wmissing-declarations \
@@ -44,6 +33,11 @@
 LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lOSLib32
 INSTALL = $(GCCSDK_INSTALL_ENV)/ro-install
 OBJS = $(SOURCE:.c=.o)
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+  EXEEXT=,e1f
+else
+  EXEEXT=,ff8
+endif
 
 all: librufl.a rufl_test$(EXEEXT) rufl_chars$(EXEEXT)
 
@@ -63,8 +57,9 @@
 MKDLK = makedlk
 SOURCE += strfuncs.c
 OBJS = $(SOURCE:.c=.o)
+EXEEXT =
 
-all: librufl.a rufl/pyd rufl_test,ff8 rufl_chars,ff8
+all: librufl.a rufl/pyd rufl_test rufl_chars
 
 librufl.a: $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS)




More information about the netsurf-commits mailing list