diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 09:48:44 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:01:42 +0100 |
| commit | be3ca836cb9a7f189759571d15ec8762cfb130fd (patch) | |
| tree | edd9751cdedea19453796cba3e5fbe38bc82b6ea /sc/util | |
| parent | 4b33c0d44fe85064d73ebe39eba4ea2d8ed018b9 (diff) | |
| parent | 6196c60c78c0a66e79d283450830e3df92f10bde (diff) | |
Merge branch 'vba' fix conflics, trailing ws & tab issues
additionally the following iz patches are rolled up with this commit i#113356, i#112998 i#113955 i#113358 i#113515 i#112531 i#112596 i#112530
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 980d271ae7c0..71c05abaaf34 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ SHL1STDLIBS= \ $(AVMEDIALIB) \ $(FORLIB) \ $(FORUILIB) - + SHL1LIBS=$(LIB3TARGET) $(LIB4TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def @@ -273,6 +273,7 @@ LIB8OBJFILES = \ $(SLO)$/filldlg.obj \ $(SLO)$/delcodlg.obj \ $(SLO)$/delcldlg.obj \ + $(SLO)$/datafdlg.obj \ $(SLO)$/dapitype.obj \ $(SLO)$/dapidata.obj \ $(SLO)$/crdlg.obj \ @@ -316,7 +317,8 @@ SHL9STDLIBS= \ $(VCLLIB) \ $(TKLIB) \ $(MSFILTERLIB) \ - $(FORLIB) + $(FORLIB) \ + $(UNOTOOLSLIB) SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN) SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib @@ -328,7 +330,7 @@ SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib .ENDIF .ENDIF - + # --- Targets ------------------------------------------------------------- |