summaryrefslogtreecommitdiff
path: root/cli_ure/CustomTarget_cli_ure_assemblies.mk
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2012-10-21 19:08:03 -0400
committerPeter Foley <pefoley2@verizon.net>2012-10-24 10:19:51 -0400
commitf61e81a6eff6b817c41f2e6d43132f3439fde7d0 (patch)
tree0f44f9e31538d541b7b50d112ec9dbb568fbc51e /cli_ure/CustomTarget_cli_ure_assemblies.mk
parent0b9ebd78778baf241cd08457e1abbe07c73c5f80 (diff)
fix warnings in cli_ure
Change-Id: I4e081473612403e0bf277e8dbf5f1b9a15541dd7
Diffstat (limited to 'cli_ure/CustomTarget_cli_ure_assemblies.mk')
-rw-r--r--cli_ure/CustomTarget_cli_ure_assemblies.mk7
1 files changed, 0 insertions, 7 deletions
diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 80a8e43ab33f..63bbe1fac2e1 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -9,10 +9,6 @@
cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST))
-# FIXME move this to configure.in ?
-cli_ure_CCNUMVER = $(shell $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk)
-cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '>=' 001399999999)
-
include $(SRCDIR)/cli_ure/version/version.txt
$(eval $(call gb_CustomTarget_CustomTarget,cli_ure/source))
@@ -43,20 +39,17 @@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
$(GNUCOPY) $< $@.tmp && \
echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)" )]' >> $@.tmp && \
- $(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )]' >> $@.tmp &&) \
mv $@.tmp $@
# TODO use macros for this
$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
$(GNUCOPY) $< $@.tmp && \
echo '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' >> $@.tmp && \
- echo '[assembly:System::Reflection::AssemblyKeyFile( "$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )];' >> $@.tmp && \
mv $@.tmp $@
$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
$(GNUCOPY) $< $@.tmp && \
echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)" )]' >> $@.tmp && \
- $(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )]' >> $@.tmp &&) \
mv $@.tmp $@
# vim: set noet sw=4 ts=4: