diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 17:13:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 17:13:15 +0000 |
| commit | 8bad56bdfdc3e182733f77ed8a8d9057b7ceb286 (patch) | |
| tree | 9d20d4ad4db6ab4507958cc10342552e04ff6a12 /xmlhelp/util | |
| parent | 29bab44354a505ef28da7b883002fe232b4706d5 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'xmlhelp/util')
| -rw-r--r-- | xmlhelp/util/makefile.mk | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk index 7f5bc89513c6..92f8559571b7 100644 --- a/xmlhelp/util/makefile.mk +++ b/xmlhelp/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2002-03-11 15:11:43 $ +# last change: $Author: hr $ $Date: 2003-03-27 18:07:36 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -77,7 +77,7 @@ NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk .IF "$(GUI)"=="WNT" -CFLAGS+=/GR +CFLAGS+=-GR .ENDIF .IF "$(COM)"=="GCC" CFLAGSCXX+=-frtti @@ -97,24 +97,9 @@ SABLOT3RDLIB=sablot.lib SHL1TARGET=$(TARGET)$(UCP_VERSION) SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) -.IF "$(OS)"!="FREEBSD" SHL1VERSIONMAP=exports.map -.ENDIF # Add additional libs here. -.IF "$(OS)"=="FREEBSD" -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(VOSLIB) \ - $(SABLOT3RDLIB) \ - $(EXPATASCII3RDLIB) \ - $(UCBHELPERLIB) \ - $(BERKELEYLIB) \ - $(BERKELEYCPPLIB) \ - -lcompat -.ELSE SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ @@ -125,7 +110,6 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(BERKELEYLIB) \ $(BERKELEYCPPLIB) -.ENDIF SHL1LIBS = \ $(SLB)$/jaqe.lib \ |