r10942 tlsa - /trunk/netsurf/riscos/Makefile.target

netsurf at semichrome.net netsurf at semichrome.net
Mon Nov 8 11:28:58 GMT 2010


Author: tlsa
Date: Mon Nov  8 05:28:58 2010
New Revision: 10942

URL: http://source.netsurf-browser.org?rev=10942&view=rev
Log:
Remove excess indentation.

Modified:
    trunk/netsurf/riscos/Makefile.target

Modified: trunk/netsurf/riscos/Makefile.target
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/Makefile.target?rev=10942&r1=10941&r2=10942&view=diff
==============================================================================
--- trunk/netsurf/riscos/Makefile.target (original)
+++ trunk/netsurf/riscos/Makefile.target Mon Nov  8 05:28:58 2010
@@ -4,61 +4,61 @@
 # RISC OS target setup
 # ----------------------------------------------------------------------------
 
-  ifeq ($(HOST),riscos)
-    LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lcares
-    LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet
-  else
-    LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcares libcurl openssl)
-    LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss)
-  endif
+ifeq ($(HOST),riscos)
+  LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lcares
+  LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet
+else
+  LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcares libcurl openssl)
+  LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss)
+endif
 
-  $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
-  $(eval $(call feature_enabled,DRAW,-DWITH_DRAW,,Drawfile rendering))
-  $(eval $(call feature_enabled,SPRITE,-DWITH_SPRITE,,Sprite rendering))
-  $(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,,ArtWorks rendering))
-  $(eval $(call feature_enabled,PLUGINS,-DWITH_PLUGIN,,Plugin protocol))
-  $(eval $(call feature_enabled,DRAW_EXPORT,-DWITH_DRAW_EXPORT,-lpencil,Drawfile export))
-  ifeq ($(HOST),riscos)
-    $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp)))
-    $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
-    $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng)  ))
-  else
-    NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-    NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-    NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-    $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
-    $(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
-    $(eval $(call pkg_config_find_and_add,PNG,libpng,PNG  ))
-  endif
+$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
+$(eval $(call feature_enabled,DRAW,-DWITH_DRAW,,Drawfile rendering))
+$(eval $(call feature_enabled,SPRITE,-DWITH_SPRITE,,Sprite rendering))
+$(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,,ArtWorks rendering))
+$(eval $(call feature_enabled,PLUGINS,-DWITH_PLUGIN,,Plugin protocol))
+$(eval $(call feature_enabled,DRAW_EXPORT,-DWITH_DRAW_EXPORT,-lpencil,Drawfile export))
+ifeq ($(HOST),riscos)
+  $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp)))
+  $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
+  $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng)  ))
+else
+  NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
+  NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
+  NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
+  $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
+  $(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
+  $(eval $(call pkg_config_find_and_add,PNG,libpng,PNG  ))
+endif
 
-  TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
+TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
 		!NetSurf/Resources/$(TPL)/Templates$(TPLEXT))
 
-  RESOURCES = $(TPD_RISCOS)
+RESOURCES = $(TPD_RISCOS)
 
-  CFLAGS += -I. $(WARNFLAGS) -Driscos				\
+CFLAGS += -I. $(WARNFLAGS) -Driscos				\
 		-std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE	\
 		-mpoke-function-name -fno-strict-aliasing
 
-  CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include			\
+CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include			\
 		-I$(GCCSDK_INSTALL_ENV)/include/libxml2		\
 		-I$(GCCSDK_INSTALL_ENV)/include/libmng
-  ifeq ($(HOST),riscos)
-    CFLAGS += -I<OSLib$$Dir> -mthrowback
+ifeq ($(HOST),riscos)
+  CFLAGS += -I<OSLib$$Dir> -mthrowback
+endif
+ASFLAGS += -xassembler-with-cpp -I. -I$(GCCSDK_INSTALL_ENV)/include
+LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib -lrufl
+ifeq ($(HOST),riscos)
+  LDFLAGS += -LOSLib: -lOSLib32
+else
+  LDFLAGS += -lOSLib32
+  ifeq ($(SUBTARGET),-elf)
+    # Go for static builds & AIF binary at the moment:
+    CFLAGS += -static
+    LDFLAGS += -static
+    EXEEXT := ,ff8
   endif
-  ASFLAGS += -xassembler-with-cpp -I. -I$(GCCSDK_INSTALL_ENV)/include
-  LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib -lrufl
-  ifeq ($(HOST),riscos)
-    LDFLAGS += -LOSLib: -lOSLib32
-  else
-    LDFLAGS += -lOSLib32
-    ifeq ($(SUBTARGET),-elf)
-      # Go for static builds & AIF binary at the moment:
-      CFLAGS += -static
-      LDFLAGS += -static
-      EXEEXT := ,ff8
-    endif
-  endif
+endif
 
 # ----------------------------------------------------------------------------
 # Source file setup




More information about the netsurf-commits mailing list