Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
a88ef236
Kaydet (Commit)
a88ef236
authored
Nis 13, 2011
tarafından
Michael Stahl
Kaydeden (comit)
Bjoern Michaelsen
Haz 17, 2011
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
üst
49342e2f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
18 deletions
+30
-18
RepositoryExternal.mk
RepositoryExternal.mk
+5
-10
Library.mk
solenv/gbuild/Library.mk
+1
-2
LinkTarget.mk
solenv/gbuild/LinkTarget.mk
+21
-1
StaticLibrary.mk
solenv/gbuild/StaticLibrary.mk
+1
-2
Library.mk
solenv/gbuild/templates/Library.mk
+2
-3
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
a88ef236
...
...
@@ -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),\
...
...
solenv/gbuild/Library.mk
Dosyayı görüntüle @
a88ef236
...
...
@@ -68,8 +68,7 @@ endef
define gb_Library__Library_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),Library)
$(call gb_LinkTarget_set_defs,$(2),\
$$(DEFS) \
$(call gb_LinkTarget_add_defs,$(2),\
$(gb_Library_DEFS) \
)
$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
...
...
solenv/gbuild/LinkTarget.mk
Dosyayı görüntüle @
a88ef236
...
...
@@ -423,6 +423,10 @@ endif
endef
define gb_LinkTarget_set_defs
ifeq (,)
$$(call gb_Output_error,\
gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.)
else
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
$(call gb_LinkTarget_get_headers_target,$(1)) \
...
...
@@ -432,6 +436,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2)
endif
endif
endef
...
...
@@ -444,10 +449,15 @@ endif
endef
define gb_LinkTarget_set_cflags
ifeq (,)
$$(call gb_Output_error,\
gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.)
else
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
endif
endif
endef
...
...
@@ -462,8 +472,11 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2)
endif
endef
# maybe should deprecate this...
define gb_LinkTarget_set_cxxflags
ifeq (,)
$$(call gb_Output_error,\
gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.)
else
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_headers_target,$(1)) \
...
...
@@ -472,6 +485,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
endif
endif
endef
...
...
@@ -483,10 +497,15 @@ endif
endef
define gb_LinkTarget_set_objcxxflags
ifeq (,)
$$(call gb_Output_error,\
gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.)
else
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
endif
endif
endef
...
...
@@ -512,6 +531,7 @@ define gb_LinkTarget_add_ldflags
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
endef
# real use in RepositoryExternal.mk
define gb_LinkTarget_set_ldflags
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
endef
...
...
solenv/gbuild/StaticLibrary.mk
Dosyayı görüntüle @
a88ef236
...
...
@@ -63,8 +63,7 @@ endef
define gb_StaticLibrary__StaticLibrary_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
$(call gb_LinkTarget_set_defs,$(2),\
$$(DEFS) \
$(call gb_LinkTarget_add_defs,$(2),\
$(gb_StaticLibrary_DEFS) \
)
$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
...
...
solenv/gbuild/templates/Library.mk
Dosyayı görüntüle @
a88ef236
...
...
@@ -49,9 +49,8 @@ $(eval $(call gb_Library_set_include,LIB,\
# add any additional definitions to be set for compilation here
# (e.g. -DLIB_DLLIMPLEMENTATION)
$(eval $(call gb_Library_set_defs,LIB,\
$$(DEFS) \
))
#$(eval $(call gb_Library_add_defs,LIB,\
#))
# add libraries to be linked to LIB; again these names need to be given as
# specified in Repository.mk
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment