r5346 dsilvers - in /branches/vince/netsurf-fb: ./ Makefile Makefile.sources

netsurf at semichrome.net netsurf at semichrome.net
Tue Sep 16 10:27:16 BST 2008


Author: dsilvers
Date: Tue Sep 16 04:27:16 2008
New Revision: 5346

URL: http://source.netsurf-browser.org?rev=5346&view=rev
Log:
Update build system to support targetting separate framebuffer frontends in different build trees, update executable to be nsfb-blah

Modified:
    branches/vince/netsurf-fb/   (props changed)
    branches/vince/netsurf-fb/Makefile
    branches/vince/netsurf-fb/Makefile.sources

Propchange: branches/vince/netsurf-fb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Sep 16 04:27:16 2008
@@ -1,5 +1,6 @@
 codedocs
 nsgtk
+nsfb-*
 build-*
 nsdebug
 Makefile.config.override

Modified: branches/vince/netsurf-fb/Makefile
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/Makefile?rev=5346&r1=5345&r2=5346&view=diff
==============================================================================
--- branches/vince/netsurf-fb/Makefile (original)
+++ branches/vince/netsurf-fb/Makefile Tue Sep 16 04:27:16 2008
@@ -158,7 +158,7 @@
   endif
 endif
 
-OBJROOT := build-$(HOST)-$(TARGET)$(SUBTARGET)
+OBJROOT = build-$(HOST)-$(TARGET)$(SUBTARGET)
 
 # ----------------------------------------------------------------------------
 # General flag setup
@@ -462,11 +462,13 @@
 
     LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm 
     LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
+    SUBTARGET := -linux
   else
     $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,NetSurf GIF decoder))
     CC=arm-able-gcc
     CFLAGS += -std=c99 -I. -I/usr/lib/able/include -Dsmall $(WARNFLAGS)
     LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm 
+    SUBTARGET := -able
   endif
 endif
 

Modified: branches/vince/netsurf-fb/Makefile.sources
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/Makefile.sources?rev=5346&r1=5345&r2=5346&view=diff
==============================================================================
--- branches/vince/netsurf-fb/Makefile.sources (original)
+++ branches/vince/netsurf-fb/Makefile.sources Tue Sep 16 04:27:16 2008
@@ -177,7 +177,7 @@
 
 ifeq ($(TARGET),framebuffer)
 SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER)
-EXETARGET := NetSurf
+EXETARGET := nsfb$(SUBTARGET)
 endif
 
 ifeq ($(SOURCES),)




More information about the netsurf-commits mailing list