INTEGRATION: CWS ause039 (1.10.8); FILE MERGED

2005/10/14 03:01:48 hjs 1.10.8.2: RESYNC: (1.10-1.11); FILE MERGED
2005/09/13 13:49:55 hjs 1.10.8.1: #i54541# fix makefiles
This commit is contained in:
Jens-Heiner Rechtien 2005-10-25 10:14:54 +00:00
parent b7e5787934
commit 2c6a4f956e

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.11 $
# $Revision: 1.12 $
#
# last change: $Author: rt $ $Date: 2005-09-08 02:01:34 $
# last change: $Author: hr $ $Date: 2005-10-25 11:14:54 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -68,8 +68,8 @@ ALLTAR : \
ASSEMBLY_KEY_X=$(subst,\,\\ $(ASSEMBLY_KEY))
$(ASSEMBLY_ATTRIBUTES) .PHONY:
+echo $(ASSEMBLY_KEY_X)
$(ASSEMBLY_ATTRIBUTES) : assembly.cxx makefile.mk $(BIN)$/cliuno.snk
@+echo $(ASSEMBLY_KEY_X)
$(GNUCOPY) -p assembly.cxx $@
+echo $(ECHOQUOTE) \
[assembly:System::Reflection::AssemblyVersion( $(ASSEMBLY_VERSION) )]; $(ECHOQUOTE) \
@ -127,3 +127,8 @@ DEF1NAME = $(SHL1TARGET)
.INCLUDE : $(PRJ)$/util$/target.pmk
.INCLUDE : target.mk
.IF "$(depend)"!=""
ALLDPC : $(ASSEMBLY_ATTRIBUTES)
.ENDIF # "$(depend)"!=""