diff options
| author | tono <tono@openoffice.org> | 2010-06-18 23:04:03 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-06-18 23:04:03 +0900 |
| commit | f9521004a8b11d1af3b9c84d3ec2beb809c05633 (patch) | |
| tree | bda6d2a95547740a7d2deeb88d494303cd854312 | |
| parent | ec81a58becbe919adde19cc969fc58f5cd1a7848 (diff) | |
| parent | 530123c25c9dfdd61887cf1b42f5141fa4e6349c (diff) | |
Merge backout
| -rw-r--r-- | sc/util/makefile.mk | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index c465a6650..b7b12e07e 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -174,11 +174,7 @@ SHL6LIBS= \ SHL6VERSIONMAP= scfilt.map SHL6DEF=$(MISC)$/$(SHL6TARGET).def DEF6NAME= $(SHL6TARGET) -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL6DEPN=$(SHL1TARGETN) -.ELSE -SHL6DEPN=$(SHL1IMPLIBN) -.ENDIF SHL6STDLIBS= \ $(ISCLIB) \ $(BASICLIB) \ @@ -210,11 +206,7 @@ SHL8TARGET= scui$(DLLPOSTFIX) SHL8IMPLIB= scuiimp SHL8VERSIONMAP= scui.map SHL8DEF=$(MISC)$/$(SHL8TARGET).def -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL8DEPN=$(SHL1TARGETN) -.ELSE -SHL8DEPN=$(SHL1IMPLIBN) -.ENDIF DEF8NAME=$(SHL8TARGET) SHL8STDLIBS= \ @@ -325,11 +317,7 @@ SHL9STDLIBS= \ $(SVXMSFILTERLIB) \ $(FORLIB) -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN) -.ELSE -SHL9DEPN=$(SHL1IMPLIBN) $(SHL8IMPLIBN) -.ENDIF SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" |