diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 10:25:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 10:25:08 +0000 |
| commit | 46bfb481bc62d31307ac93cbc48968eb0ae0314c (patch) | |
| tree | 84177cf873dfce88c521da4c2072752cb9abe934 /transex3 | |
| parent | 0b376f69ec3b143c8e109b2f186cabb75e9b8d84 (diff) | |
INTEGRATION: CWS pj15 (1.33.22); FILE MERGED
2005/01/06 04:03:25 pjanik 1.33.22.2: #i38161#: static libraries should go at the end of the link command for
MacOS X.
2005/01/03 15:05:44 pjanik 1.33.22.1: #i38161#: static libraries should go at the end of the link command for MacOS X.
Diffstat (limited to 'transex3')
| -rw-r--r-- | transex3/source/makefile.mk | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk index d770c0964003..a00f0f7bd59b 100644 --- a/transex3/source/makefile.mk +++ b/transex3/source/makefile.mk @@ -2,8 +2,8 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.33 $ -# last change: $Author: hr $ $Date: 2004-10-11 13:56:09 $ +# $Revision: 1.34 $ +# last change: $Author: rt $ $Date: 2005-01-11 11:25:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -109,11 +109,21 @@ APP1VERSIONMAP=exports.map # extractor and merger for *.src and *.hrc APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/src_yy.obj + +.IF "$(OS)"!="MACOSX" +APP1STDLIBS+= $(BTSTRPLIB) +.ENDIF + APP1STDLIBS+= \ - $(BTSTRPLIB) \ $(TOOLSLIB) \ $(VOSLIB) \ $(SALLIB) + +.IF "$(OS)"=="MACOSX" +# static libs at end for OS X +APP1STDLIBS+= $(BTSTRPLIB) +.ENDIF + APP1LIBS+= $(LB)$/$(PRJNAME).lib APP1DEPN= $(OBJ)$/src_yy.obj $(LB)$/$(PRJNAME).lib @@ -204,12 +214,21 @@ APP9TARGET= localize_sl EXCEPTIONSFILES= \ $(OBJ)$/localize.obj APP9OBJS= $(OBJ)$/localize.obj $(OBJ)$/utf8conv.obj $(OBJ)$/srciter.obj $(OBJ)$/export2.obj + +.IF "$(OS)"!="MACOSX" +APP9STDLIBS+= $(BTSTRPLIB) +.ENDIF + APP9STDLIBS+= \ - $(BTSTRPLIB) \ $(TOOLSLIB) \ $(VOSLIB) \ $(SALLIB) +.IF "$(OS)"=="MACOSX" +# static libs at end for OS X +APP9STDLIBS+= $(BTSTRPLIB) +.ENDIF + DEPOBJFILES=$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) $(APP7OBJS) $(APP8OBJS) $(APP9OBJS) # --- Targets ------------------------------------------------------ |