summaryrefslogtreecommitdiff
path: root/sd/util
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 14:52:30 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 14:52:30 +0000
commit08344ff8f15fa679197b7898cbebe654dbbb7722 (patch)
tree49af22f51ebec69afd2408316bcbb2e0db0ee42a /sd/util
parent3f822296c14fd6f6e20f295b6a191d7521f810a8 (diff)
INTEGRATION: CWS dialogdiet01 (1.27.8); FILE MERGED
2004/04/22 02:01:39 mwu 1.27.8.1: dialogdiet01 m33 sd 20040422
Diffstat (limited to 'sd/util')
-rw-r--r--sd/util/makefile.mk70
1 files changed, 49 insertions, 21 deletions
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 582228b176f3..9c5e6362469b 100644
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.27 $
+# $Revision: 1.28 $
#
-# last change: $Author: obo $ $Date: 2004-03-17 13:53:33 $
+# last change: $Author: hr $ $Date: 2004-05-10 15:52:30 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -81,7 +81,7 @@ RESLIB1SRSFILES=\
# --- StarDraw DLL
SHL1TARGET= sd$(UPD)$(DLLPOSTFIX)
-SHL1VERSIONMAP= sd.map
+#SHL1VERSIONMAP= sd.map
SHL1IMPLIB= sdi
@@ -132,6 +132,10 @@ SHL1DEPN+= makefile.mk
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt
+DEF1NAME =$(SHL1TARGET)
+DEFLIB1NAME = $(TARGET)
+
.IF "$(GUI)" == "WNT"
SHL1RES= $(RCTARGET)
.ENDIF
@@ -184,29 +188,53 @@ SHL2OBJS= $(SLO)$/sddetect.obj \
$(SLO)$/detreg.obj
SHL2DEPN+= makefile.mk
+# add for sdui
+SHL4TARGET= sdui$(UPD)$(DLLPOSTFIX)
+SHL4IMPLIB= sduiimp
+SHL4VERSIONMAP= sdui.map
+SHL4DEF=$(MISC)$/$(SHL4TARGET).def
+DEF4NAME= $(SHL4TARGET)
+SHL4LIBS= $(SLB)$/sdui_all.lib
+
+LIB4TARGET = $(SLB)$/sdui_all.lib
+LIB4OBJFILES= $(SLO)$/pubdlg.obj
+LIB4FILES = $(SLB)$/sdui.lib
+
+SHL4STDLIBS= \
+ $(ISDLIB) \
+ $(SVXLIB) \
+ $(SFXLIB) \
+ $(BASICLIB) \
+ $(BASEGFXLIB) \
+ $(GOODIESLIB) \
+ $(SO2LIB) \
+ $(SVTOOLLIB) \
+ $(TKLIB) \
+ $(VCLLIB) \
+ $(SVLLIB) \
+ $(SOTLIB) \
+ $(UNOTOOLSLIB) \
+ $(TOOLSLIB) \
+ $(COMPHELPERLIB) \
+ $(UCBHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(VOSLIB) \
+ $(CANVASLIB) \
+ $(SALLIB)
+
-# --- Targets -------------------------------------------------------------
-.INCLUDE : target.mk
-.IF "$(GUI)" == "WNT"
-$(MISC)$/$(SHL1TARGET).def:
- @echo ------------------------------
- @echo Making: $@
- @echo LIBRARY $(SHL1TARGET) >$@
- @echo DESCRIPTION 'SDRAW3 DLL' >>$@
- @echo DATA READ WRITE NONSHARED >>$@
- @echo EXPORTS >>$@
- @echo component_getImplementationEnvironment >>$@
- @echo component_writeInfo >>$@
- @echo component_getFactory >>$@
-.ENDIF
-$(MISCX)$/$(SHL1TARGET).flt:
+# --- Targets -------------------------------------------------------------
+
+.INCLUDE : target.mk
+
+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
@echo ------------------------------
@echo Making: $@
- @echo WEP>$@
- @echo LIBMAIN>>$@
- @echo LibMain>>$@
+ @+$(TYPE) sd.flt > $@
+