INTEGRATION: CWS ause048 (1.3.186); FILE MERGED

2006/02/06 14:37:02 hjs 1.3.186.1: #i61266# DLLSUFFIX is obsolete. use DLLPOSTFIX instead
This commit is contained in:
Rüdiger Timm 2006-03-08 12:52:28 +00:00
parent 6625510f8a
commit 9ac6790a16

View file

@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.3 $ # $Revision: 1.4 $
# #
# last change: $Author: rt $ $Date: 2005-10-19 14:42:19 $ # last change: $Author: rt $ $Date: 2006-03-08 13:52:28 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -91,13 +91,12 @@ add_cflagscxx="-frtti -fexceptions"
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
ALL : \ .INCLUDE : target.mk
ALLTAR \
ALLTAR : \
$(SCRIPTFILES) \ $(SCRIPTFILES) \
$(BIN)$/gengal.rdb $(BIN)$/gengal.rdb
.INCLUDE : target.mk
$(SCRIPTFILES) : $$(@:f:+".sh") $(SCRIPTFILES) : $$(@:f:+".sh")
+@tr -d "\015" < $(@:f:+".sh") > $@ +@tr -d "\015" < $(@:f:+".sh") > $@
@ -110,7 +109,7 @@ $(BIN)$/gengal.rdb : makefile.mk $(UNOUCRRDB)
-c i18npool.uno$(DLLPOST) \ -c i18npool.uno$(DLLPOST) \
-c configmgr2.uno$(DLLPOST) \ -c configmgr2.uno$(DLLPOST) \
-c servicemgr.uno$(DLLPOST) \ -c servicemgr.uno$(DLLPOST) \
-c $(DLLPRE)fwl$(UPD)$(DLLSUFFIX)$(DLLPOST) \ -c $(DLLPRE)fwl$(UPD)$(DLLPOSTFIX)$(DLLPOST) \
-c $(DLLPRE)ucpfile1$(DLLPOST) \ -c $(DLLPRE)ucpfile1$(DLLPOST) \
-c $(DLLPRE)fileacc$(DLLPOST) \ -c $(DLLPRE)fileacc$(DLLPOST) \
-c $(DLLPRE)ucb1$(DLLPOST) -c $(DLLPRE)ucb1$(DLLPOST)