strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gnumake2: added static ooopathutils lib

Browse source
This commit is contained in:
Bjoern Michaelsen 2010-08-04 16:32:43 +02:00
parent 857c513776
commit b8c94f1b57
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Targetnames.mk
View file

@ -116,13 +116,14 @@ gb_Library_UNOLIBS_OOO := \
# => URELIB
gb_Library_UNOVERLIBS :=\
jvmfwk \
cppu \
jvmfwk \
sal \
gb_StaticLibrary_PLAINLIBS :=\
salcpprt \
jpeglib \
ooopathutils \
salcpprt \
zlib \
# vim: set noet sw=4 ts=4:

3
solenv/gbuild/Library.mk
View file

@ -39,6 +39,7 @@
# gb_Library_TARGETTYPEFLAGS
# gb_Library_Library_platform
.PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT)
$(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%$(gb_Library_PLAINEXT)))
$(call gb_Helper_abbreviate_dirs,\
@ -48,13 +49,13 @@ $(gb_Library_OUTDIRLOCATION)/%$(gb_Library_PLAINEXT) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && cp -pf $< $@)
define gb_Library_Library
ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
$$(info currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)))
$$(error Library $(1) must be registered in $(GBUILDDIR)/inc/libnames.mk)
endif
$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(call gb_Library_get_filename,$(1))))
endef
define gb_Library__Library_impl

8
solenv/gbuild/StaticLibrary.mk
View file

@ -58,16 +58,18 @@ endef
define gb_StaticLibrary__StaticLibrary_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_StaticLibrary_TARGETTYPEFLAGS))
$(call gb_LinkTarget_set_defs,$(2)),\
$(call gb_LinkTarget_set_defs,$(2),\
$$(DEFS) \
$(gb_StaticLibrary_DEFS) \
)
$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_StaticLibrary_get_target,$(2))
$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1)))
endef
define gb_StaticLibrary_forward_to_Linktarget
gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_Library_get_linktargetname,$$(call gb_Library_get_filename,$$(1))),$$(2))
gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_StaticLibrary_get_linktargetname,$$(call gb_StaticLibrary_get_filename,$$(1))),$$(2))
endef

2
solenv/gbuild/TargetLocations.mk
View file

@ -98,6 +98,7 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
Module \
Package \
ResTarget \
StaticLibrary \
))
$(eval $(call gb_Helper_make_dep_targets,\
@ -118,6 +119,7 @@ gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1)
gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1)
gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc
gb_ResTarget_get_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_StaticLibrary_get_linktargetname = StaticLibrary/$(1)
define gb_Module_register_target
gb_Module_TARGETSTACK := $(1) $(gb_Module_TARGETSTACK)

2
solenv/gbuild/platform/linux.mk
View file

@ -273,7 +273,7 @@ gb_Library_Library_platform =
# StaticLibrary class
gb_StaticLibrary_DEFS :=
gb_StaticLibrary_TARGETTYPEFLAGS := -Wl,-z,noexecstack
gb_StaticLibrary_TARGETTYPEFLAGS := -Wl,-z,noexecstack -static -nostdlib
gb_StaticLibrary_SYSPRE := lib
gb_StaticLibrary_PLAINEXT := .a
gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)