INTEGRATION: CWS tune03 (1.25.10); FILE MERGED

2004/08/12 17:48:31 mhu 1.25.10.4: #i29979# Adapted to new ScDPDateGroupDlg (moved to scui).
2004/07/21 12:49:20 hjs 1.25.10.3: #i29979# remove obsolete *.flt remains
2004/07/20 10:29:55 hjs 1.25.10.2: #29979# SHLnUSE_EXPORTS set to ordinal
2004/07/08 16:45:19 mhu 1.25.10.1: #i29979# Added SC_DLLPUBLIC/PRIVATE (see scdllapi.h) to exported symbols/classes.

1 files changed, 50 insertions, 111 deletions

diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index e787609f6a55..72780a2e3ac2 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.26 $
+#   $Revision: 1.27 $
 #
-#   last change: $Author: obo $ $Date: 2004-08-12 09:32:20 $
+#   last change: $Author: rt $ $Date: 2004-08-23 09:41:58 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,9 +64,9 @@ PRJ=..
 
 PRJNAME=sc
 TARGET=scalc3
-#LIBTARGET=NO
 GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
+USE_DEFFILE=TRUE
 
 # --- Settings -----------------------------------------------------------
 
@@ -101,15 +101,14 @@ RESLIB1IMAGES=\
     $(PRJ)$/res/imglst/apptbx	\
     $(PRJ)$/res/imglst/dbgui	\
     $(PRJ)$/res/imglst/navipi	
-    
-    
+
 RESLIB1SRSFILES=\
     $(RESLIB1LIST)
 
 # --- StarClac DLL
 
 SHL1TARGET= sc$(UPD)$(DLLPOSTFIX)
-#SHL1VERSIONMAP= sc.map
+SHL1USE_EXPORTS=ordinal
 SHL1IMPLIB= sci
 
 .IF "$(OS)"!="MACOSX"
@@ -148,7 +147,6 @@ SHL1STDLIBS+= $(SCHLIB)
 .ENDIF
 
 SHL1DEPN=   $(L)$/itools.lib
-#SHL1LIBS=   $(LIB3TARGET) $(LIB4TARGET)
 SHL1LIBS= $(LIB1TARGET)
 LIB1TARGET=$(SLB)$/scall.lib
 LIB1FILES = $(LIB3TARGET) $(LIB4TARGET)
@@ -158,7 +156,6 @@ SHL1OBJS=   $(SLO)$/scdll.obj
 .ENDIF
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
 DEF1NAME=$(SHL1TARGET)
 DEFLIB1NAME= scall
 
@@ -200,7 +197,7 @@ LIB3FILES=	\
     $(SLB)$/pagedlg.lib \
     $(SLB)$/drawfunc.lib \
     $(SLB)$/navipi.lib
-    
+
 LIB3FILES+= \
             $(SLB)$/unoobj.lib
 
@@ -259,27 +256,19 @@ SHL8DEF=$(MISC)$/$(SHL8TARGET).def
 DEF8NAME=       $(SHL8TARGET)
 
 SHL8STDLIBS= \
-        $(ISCLIB)	\
+            $(ISCLIB) \
             $(SVXLIB) \
             $(SFX2LIB) \
-            $(GOODIESLIB) \
-            $(SO2LIB) \
             $(SVTOOLLIB) \
-            $(TKLIB) \
             $(VCLLIB) \
             $(SVLLIB) \
             $(SOTLIB) \
             $(UNOTOOLSLIB) \
             $(TOOLSLIB) \
             $(COMPHELPERLIB) \
-            $(UCBHELPERLIB)	\
-            $(CPPUHELPERLIB)	\
             $(CPPULIB) \
-            $(VOSLIB) \
-            $(SALLIB) \
-            $(ICUUCLIB)	\
-            $(BASICLIB)
-            
+            $(SALLIB)
+
 SHL8LIBS=   $(SLB)$/scui.lib
 LIB8TARGET = $(SLB)$/scui.lib
 
@@ -288,98 +277,48 @@ LIB8FILES=$(SLB)$/styleui.lib	\
 
 LIB8OBJFILES = \
         $(SLO)$/scuiexp.obj     \
-            $(SLO)$/scdlgfact.obj	\
-             $(SLO)$/tpsubt.obj		\
-            $(SLO)$/tptable.obj	\
-             $(SLO)$/tpstat.obj	\
-            $(SLO)$/tabpages.obj	\
-            $(SLO)$/tpsort.obj		\
-            $(SLO)$/sortdlg.obj		\
-            $(SLO)$/validate.obj	\
-            $(SLO)$/textdlgs.obj		\
-            $(SLO)$/subtdlg.obj		\
-             $(SLO)$/tphf.obj		\
-            $(SLO)$/scuitphfedit.obj	\
-            $(SLO)$/hfedtdlg.obj	\
-            $(SLO)$/attrdlg.obj	\
-             $(SLO)$/scuiimoptdlg.obj	\
-            $(SLO)$/strindlg.obj		\
-            $(SLO)$/shtabdlg.obj		\
-             $(SLO)$/scendlg.obj		\
-             $(SLO)$/pvfundlg.obj	\
-            $(SLO)$/pfiltdlg.obj	\
-            $(SLO)$/namepast.obj		\
-            $(SLO)$/namecrea.obj		\
-            $(SLO)$/mvtabdlg.obj		\
-            $(SLO)$/mtrindlg.obj		\
-            $(SLO)$/linkarea.obj		\
-            $(SLO)$/lbseldlg.obj		\
-            $(SLO)$/instbdlg.obj		\
-            $(SLO)$/inscodlg.obj		\
-            $(SLO)$/inscldlg.obj		\
-            $(SLO)$/groupdlg.obj		\
-            $(SLO)$/filldlg.obj			\
-            $(SLO)$/delcodlg.obj		\
-            $(SLO)$/delcldlg.obj		\
-             $(SLO)$/dapitype.obj	\
-            $(SLO)$/dapidata.obj	\
-            $(SLO)$/crdlg.obj			\
-            $(SLO)$/scuiasciiopt.obj	\
-            $(SLO)$/scuiautofmt.obj
-# --- Targets -------------------------------------------------------------
-
-.IF "$(depend)" == ""
-
-#APP1HEAP=	8192
-#.IF "$(GUI)"!="WNT"
-#.IF "$(GUI)"=="WIN"
-# DGROUP:  DATA<0x5000  HEAP==0x2000  => STACK:0x9000 (36k)
-# wenn das runtergesetz wird, muss evtl. in data\cell.cxx die
-# MAXRECURSION Tiefe angepasst werden !!! (leider ein PI mal Daumen Wert)
-#APP1STACK=36864
-#.ELSE
-# os2: ca. 2,3*win
-#APP1STACK=81920
-#.ENDIF
-#.ENDIF
-.ENDIF
+        $(SLO)$/scdlgfact.obj \
+        $(SLO)$/tpsubt.obj		\
+        $(SLO)$/tptable.obj	\
+        $(SLO)$/tpstat.obj	\
+        $(SLO)$/tabpages.obj	\
+        $(SLO)$/tpsort.obj		\
+        $(SLO)$/sortdlg.obj		\
+        $(SLO)$/validate.obj	\
+        $(SLO)$/textdlgs.obj		\
+        $(SLO)$/subtdlg.obj		\
+        $(SLO)$/tphf.obj		\
+        $(SLO)$/scuitphfedit.obj	\
+        $(SLO)$/hfedtdlg.obj	\
+        $(SLO)$/attrdlg.obj	\
+        $(SLO)$/scuiimoptdlg.obj	\
+        $(SLO)$/strindlg.obj		\
+        $(SLO)$/shtabdlg.obj		\
+        $(SLO)$/scendlg.obj		\
+        $(SLO)$/pvfundlg.obj	\
+        $(SLO)$/pfiltdlg.obj	\
+        $(SLO)$/namepast.obj		\
+        $(SLO)$/namecrea.obj		\
+        $(SLO)$/mvtabdlg.obj		\
+        $(SLO)$/mtrindlg.obj		\
+        $(SLO)$/linkarea.obj		\
+        $(SLO)$/lbseldlg.obj		\
+        $(SLO)$/instbdlg.obj		\
+        $(SLO)$/inscodlg.obj		\
+        $(SLO)$/inscldlg.obj		\
+        $(SLO)$/groupdlg.obj		\
+        $(SLO)$/filldlg.obj			\
+        $(SLO)$/delcodlg.obj		\
+        $(SLO)$/delcldlg.obj		\
+        $(SLO)$/dapitype.obj	\
+        $(SLO)$/dapidata.obj	\
+        $(SLO)$/crdlg.obj			\
+        $(SLO)$/scuiasciiopt.obj	\
+        $(SLO)$/scuiautofmt.obj	\
+        $(SLO)$/dpgroupdlg.obj	\
+        $(SLO)$/editfield.obj
 
+# --- Targets -------------------------------------------------------------
 
 .INCLUDE :  target.mk
    
-    
-.IF "$(depend)" == ""
-
-
-.IF "$(GUI)" == "WNT"
-
-#$(MISC)$/$(SHL1TARGET).def:  makefile.mk
-#    @echo ------------------------------
-#    @echo Making: $@
-#    @echo LIBRARY     $(SHL1TARGET)                                  >$@
-#    @echo DESCRIPTION 'SCALC3 DLL'                                 >>$@
-#    @echo DATA        READ WRITE NONSHARED                          >>$@
-#    @echo EXPORTS                                                   >>$@
-#    @echo   component_getImplementationEnvironment @24             >>$@
-#    @echo   component_writeInfo @25                                >>$@
-#    @echo   component_getFactory @26                               >>$@
-.ENDIF
-
-.IF "$(OPTLINKS)" == "YES"
-    echo  RC $(RCFLAGS) $(RES)$/scappi.res                    >>$@
-.ENDIF
-
-.ENDIF
-
-#$(MISCX)$/$(SHL1TARGET).flt:
-#    @echo ------------------------------
-#    @echo Making: $@
-#    @echo WEP>$@
-#    @echo LIBMAIN>>$@
-#    @echo LibMain>>$@
-
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @+$(TYPE) sc.flt > $@
\ No newline at end of file