diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-24 22:13:56 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-26 11:46:54 +0200 |
commit | a7d45d8d7a67d07bf83634a2ba7320b78b32f79c (patch) | |
tree | 5411236c084b18518dede6ef1d49a88266149093 /solenv/gbuild | |
parent | e02011c5c59dbb99fc6f33b9ed2727e02fe67c02 (diff) |
gbuild: remove empty gb_StaticLibrary_JPEGLIBS and gb_StaticLibrary_DEFS
Change-Id: I364ba0155e30909fd77c0c73e27e5c9ee0a59168
Diffstat (limited to 'solenv/gbuild')
-rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/solaris.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 3 |
7 files changed, 0 insertions, 22 deletions
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 12834d8a7815..124b009213b4 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -32,7 +32,6 @@ # defined globally in gbuild.mk # gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib # defined by platform -# gb_StaticLibrary_DEFS # gb_StaticLibrary_FILENAMES # gb_StaticLibrary_TARGETS @@ -63,9 +62,6 @@ endef define gb_StaticLibrary__StaticLibrary_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary) -$(call gb_LinkTarget_add_defs,$(2),\ - $(gb_StaticLibrary_DEFS) \ -) $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_StaticLibrary_get_target,$(1))).dir $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 7656bdd99862..daef8275892c 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -248,13 +248,10 @@ endef # StaticLibrary class -gb_StaticLibrary_DEFS := gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a -gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \ $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ gb_StaticLibrary_StaticLibrary_platform = diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index b244ceb632e0..d8242aa79d28 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -345,13 +345,10 @@ endef # StaticLibrary class -gb_StaticLibrary_DEFS := gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a -gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \ $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES)) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 180a93f2bc08..dd7fe1fad6d4 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -544,14 +544,11 @@ endef # StaticLibrary class -gb_StaticLibrary_DEFS := gb_StaticLibrary_TARGETTYPEFLAGS := -LIB gb_StaticLibrary_SYSPRE := gb_StaticLibrary_PLAINEXT := .lib -gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \ $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES)) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 984621f53d10..8317c40f9f06 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -324,13 +324,10 @@ endef # StaticLibrary class -gb_StaticLibrary_DEFS := gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a -gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \ $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ gb_StaticLibrary_StaticLibrary_platform = diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 3a95d90030b8..6c77d71247f0 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -300,13 +300,10 @@ gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) # StaticLibrary class -gb_StaticLibrary_DEFS := gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a -gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \ $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ gb_StaticLibrary_StaticLibrary_platform = diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 6e50439a09eb..0e18a741e248 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -296,13 +296,10 @@ gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) # StaticLibrary class -gb_StaticLibrary_DEFS := gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a -gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \ $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ gb_StaticLibrary_StaticLibrary_platform = |