diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-09-15 13:02:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-09-15 13:02:48 +0000 |
| commit | 7b330c7c3f9eeae78caa5fba18b12ff1dcd4ba21 (patch) | |
| tree | 6fc293a51cd5bccb6fd036f8fbe50f9b8de79432 /sc/util | |
| parent | 7dd97067068a00ca7952d71a4e83b195527e7c69 (diff) | |
INTEGRATION: CWS ause066 (1.35.64); FILE MERGED
2006/08/31 13:46:48 hjs 1.35.64.1: #i69141# cleanup
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/makefile.mk | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index ab45cf49f010..b770470f8231 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.35 $ +# $Revision: 1.36 $ # -# last change: $Author: ihi $ $Date: 2006-06-29 11:28:43 $ +# last change: $Author: obo $ $Date: 2006-09-15 14:02:48 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -43,11 +43,8 @@ USE_DEFFILE=TRUE # --- Settings ----------------------------------------------------------- -.INCLUDE : connectivity/version.mk .INCLUDE : settings.mk -IENV!:=$(IENV);..$/res - .IF "$(OS)"=="IRIX" LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30 .ENDIF @@ -136,23 +133,6 @@ SHL1RES= $(RCTARGET) # --- Linken der Applikation --------------------------------------- LIB3TARGET=$(SLB)$/scalc3.lib -#LIB3FILES= \ -# $(SLB)$/app.lib \ -# $(SLB)$/docshell.lib \ -# $(SLB)$/view.lib \ -# $(SLB)$/undo.lib \ -# $(SLB)$/attrdlg.lib \ -# $(SLB)$/namedlg.lib \ -# $(SLB)$/styleui.lib \ -# $(SLB)$/miscdlgs.lib \ -# $(SLB)$/formdlgs.lib \ -# $(SLB)$/cctrl.lib \ -# $(SLB)$/dbgui.lib \ -# $(SLB)$/optdlg.lib \ -# $(SLB)$/pagedlg.lib \ -# $(SLB)$/drawfunc.lib \ -# $(SLB)$/navipi.lib - LIB3FILES= \ $(SLB)$/app.lib \ $(SLB)$/docshell.lib \ @@ -188,15 +168,6 @@ LIB4FILES= \ $(SLB)$/ftools.lib \ $(SLB)$/scflt.lib -#LIB5TARGET=$(LB)$/sclib.lib -#LIB5ARCHIV=$(LB)$/libsclib.a - -.IF "$(depend)" == "" -ALL: \ - $(MISC)$/linkinc.ls \ - ALLTAR -.ENDIF - SHL2TARGET= scd$(UPD)$(DLLPOSTFIX) SHL2IMPLIB= scdimp SHL2VERSIONMAP= scd.map @@ -296,5 +267,7 @@ LIB8OBJFILES = \ .INCLUDE : target.mk +ALLTAR: $(MISC)$/linkinc.ls + |