diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-13 16:11:41 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 14:24:10 +0200 |
| commit | a88ef23697b3ed012a01506d6d7587efa70540ed (patch) | |
| tree | 2f51bddc48b561e843ba3afb9453c71165df2af2 /RepositoryExternal.mk | |
| parent | 49342e2fad2f3d744a39e793b2783fe89985d7d2 (diff) | |
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1e42557fe33d..6c1401572c73 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -39,8 +39,7 @@ ifeq ($(SYSTEM_ZLIB),YES) define gb_LinkTarget__use_zlib -$(call gb_LinkTarget_set_defs,$(1),\ - $$(DEFS) \ +$(call gb_LinkTarget_add_defs,$(1),\ -DSYSTEM_ZLIB \ ) $(call gb_LinkTarget_add_libs,$(1),-lz) @@ -90,8 +89,7 @@ ifeq ($(SYSTEM_EXPAT),YES) define gb_LinkTarget__use_expat $(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter)) -$(call gb_LinkTarget_set_defs,$(1),\ - $$(DEFS) \ +$(call gb_LinkTarget_add_defs,$(1),\ -DSYSTEM_EXPAT \ ) @@ -110,8 +108,7 @@ define gb_LinkTarget__use_expat $(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter)) $(if $(filter-out ascii_expat_xmlparse,$(2)),\ - $(call gb_LinkTarget_set_defs,$(1),\ - $$(DEFS) \ + $(call gb_LinkTarget_add_defs,$(1),\ -DXML_UNICODE \ )) @@ -136,8 +133,7 @@ endef ifeq ($(SYSTEM_LIBXML),YES) define gb_LinkTarget__use_libxml2 -$(call gb_LinkTarget_set_defs,$(1),\ - $$(DEFS) \ +$(call gb_LinkTarget_add_defs,$(1),\ -DSYSTEM_LIBXML \ ) $(call gb_LinkTarget_set_include,$(1),\ @@ -190,8 +186,7 @@ endif # SYSTEM_LIBXSLT ifeq ($(SYSTEM_REDLAND),YES) define gb_LinkTarget__use_librdf -$(call gb_LinkTarget_set_defs,$(1),\ - $$(DEFS) \ +$(call gb_LinkTarget_add_defs,$(1),\ -DSYSTEM_REDLAND \ ) $(call gb_LinkTarget_set_include,$(1),\ |