keep it consistent and add a blank line before all endef

This commit is contained in:
Caolán McNamara
2011-07-25 22:10:33 +01:00
parent 471233958b
commit 6bccd20b2d

View File

@@ -46,6 +46,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
$(CPPUNIT_LIBS) \ $(CPPUNIT_LIBS) \
) )
endef endef
else else
@@ -58,6 +59,7 @@ define gb_LinkTarget__use_cppunit
$(call gb_LinkTarget_add_linked_libs,$(1),\ $(call gb_LinkTarget_add_linked_libs,$(1),\
cppunit \ cppunit \
) )
endef endef
endif endif
@@ -69,6 +71,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_ZLIB \ -DSYSTEM_ZLIB \
) )
$(call gb_LinkTarget_add_libs,$(1),-lz) $(call gb_LinkTarget_add_libs,$(1),-lz)
endef endef
else # !SYSTEM_ZLIB else # !SYSTEM_ZLIB
@@ -81,6 +84,7 @@ define gb_LinkTarget__use_zlib
$(call gb_LinkTarget_add_linked_static_libs,$(1),\ $(call gb_LinkTarget_add_linked_static_libs,$(1),\
zlib \ zlib \
) )
endef endef
endif # SYSTEM_ZLIB endif # SYSTEM_ZLIB
@@ -93,6 +97,7 @@ $(call gb_LinkTarget_add_libs,$(1),-ljpeg)
$(call gb_LinkTarget_set_ldflags,$(1),\ $(call gb_LinkTarget_set_ldflags,$(1),\
$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
) )
endef endef
else # !SYSTEM_JPEG else # !SYSTEM_JPEG
@@ -105,6 +110,7 @@ define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_add_linked_static_libs,$(1),\ $(call gb_LinkTarget_add_linked_static_libs,$(1),\
jpeglib \ jpeglib \
) )
endef endef
endif # SYSTEM_JPEG endif # SYSTEM_JPEG
@@ -120,6 +126,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
) )
$(call gb_LinkTarget_add_libs,$(1),-lexpat) $(call gb_LinkTarget_add_libs,$(1),-lexpat)
endef endef
else # !SYSTEM_EXPAT else # !SYSTEM_EXPAT
@@ -142,6 +149,7 @@ $(call gb_LinkTarget_add_linked_static_libs,$(1),\
$(2) \ $(2) \
expat_xmltok \ expat_xmltok \
) )
endef endef
endif # SYSTEM_EXPAT endif # SYSTEM_EXPAT
@@ -149,10 +157,12 @@ endif # SYSTEM_EXPAT
# now define 2 wrappers that select which internal static library to use... # now define 2 wrappers that select which internal static library to use...
define gb_LinkTarget__use_expat_utf8 define gb_LinkTarget__use_expat_utf8
$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse) $(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse)
endef endef
define gb_LinkTarget__use_expat_utf16 define gb_LinkTarget__use_expat_utf16
$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse) $(call gb_LinkTarget__use_expat,$(1),expat_xmlparse)
endef endef
@@ -167,6 +177,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(LIBXML_CFLAGS) \ $(LIBXML_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(LIBXML_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(LIBXML_LIBS))
endef endef
else # !SYSTEM_LIBXML else # !SYSTEM_LIBXML
@@ -179,6 +190,7 @@ define gb_LinkTarget__use_libxml2
$(call gb_LinkTarget_add_linked_libs,$(1),\ $(call gb_LinkTarget_add_linked_libs,$(1),\
xml2 \ xml2 \
) )
endef endef
endif # SYSTEM_LIBXML endif # SYSTEM_LIBXML
@@ -192,6 +204,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(LIBXSLT_CFLAGS) \ $(LIBXSLT_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS))
endef endef
else # !SYSTEM_LIBXSLT else # !SYSTEM_LIBXSLT
@@ -204,6 +217,7 @@ define gb_LinkTarget__use_libxslt
$(call gb_LinkTarget_add_linked_libs,$(1),\ $(call gb_LinkTarget_add_linked_libs,$(1),\
xslt \ xslt \
) )
endef endef
endif # SYSTEM_LIBXSLT endif # SYSTEM_LIBXSLT
@@ -220,6 +234,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(REDLAND_CFLAGS) \ $(REDLAND_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(REDLAND_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(REDLAND_LIBS))
endef endef
else # !SYSTEM_REDLAND else # !SYSTEM_REDLAND
@@ -232,6 +247,7 @@ define gb_LinkTarget__use_librdf
$(call gb_LinkTarget_add_linked_libs,$(1),\ $(call gb_LinkTarget_add_linked_libs,$(1),\
rdf \ rdf \
) )
endef endef
endif # SYSTEM_REDLAND endif # SYSTEM_REDLAND
@@ -247,6 +263,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(CAIRO_CFLAGS) \ $(CAIRO_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))
endef endef
else # !SYSTEM_CAIRO else # !SYSTEM_CAIRO
@@ -294,6 +311,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(GRAPHITE_CFLAGS) \ $(GRAPHITE_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
endef endef
else # !SYSTEM_GRAPHITE else # !SYSTEM_GRAPHITE
@@ -305,6 +323,7 @@ define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_add_linked_static_libs,$(1),\ $(call gb_LinkTarget_add_linked_static_libs,$(1),\
graphite2_off \ graphite2_off \
) )
endef endef
endif # SYSTEM_GRAPHITE endif # SYSTEM_GRAPHITE
@@ -317,9 +336,11 @@ $(call gb_LinkTarget_add_libs,$(1),-licui18n)
endef endef
define gb_LinkTarget__use_icule define gb_LinkTarget__use_icule
$(call gb_LinkTarget_add_libs,$(1),-licule) $(call gb_LinkTarget_add_libs,$(1),-licule)
endef endef
define gb_LinkTarget__use_icuuc define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_libs,$(1),-licuuc) $(call gb_LinkTarget_add_libs,$(1),-licuuc)
endef endef
else # !SYSTEM_ICU else # !SYSTEM_ICU
@@ -339,11 +360,13 @@ define gb_LinkTarget__use_icule
$(call gb_LinkTarget_add_linked_libs,$(1),\ $(call gb_LinkTarget_add_linked_libs,$(1),\
icule \ icule \
) )
endef endef
define gb_LinkTarget__use_icuuc define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_linked_libs,$(1),\ $(call gb_LinkTarget_add_linked_libs,$(1),\
icuuc \ icuuc \
) )
endef endef
endif # SYSTEM_ICU endif # SYSTEM_ICU
@@ -357,6 +380,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(OPENSSL_CFLAGS) \ $(OPENSSL_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
endef endef
else # !SYSTEM_OPENSSL else # !SYSTEM_OPENSSL
@@ -391,6 +415,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
) )
endif endif
endif endif
endef endef
endif # SYSTEM_OPENSSL endif # SYSTEM_OPENSSL