diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 12:31:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 12:31:32 +0000 |
| commit | 93fce7f42b5b0d3cab8de64cdc9d6fa060ec6f96 (patch) | |
| tree | 7de9f1440939749a1b14c17a2ab90394beb315d7 /desktop/util | |
| parent | ae218351602ffed03b33f5ff6aa4c0770e55de9e (diff) | |
INTEGRATION: CWS tune01 (1.14.8.6.2.5.18); FILE MERGED
2003/04/07 16:11:31 mhu 1.14.8.6.2.5.18.2: RESYNC: (1.14.8.6.2.5-1.27); FILE MERGED
2003/03/02 19:51:54 mhu 1.14.8.6.2.5.18.1: #i11968# Added symbol scoping linker mapfiles to dynamically loaded libraries.
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 73 |
1 files changed, 49 insertions, 24 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index d65e036b0204..92aefa755d56 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.27 $ +# $Revision: 1.28 $ # -# last change: $Author: mh $ $Date: 2003-04-02 10:16:17 $ +# last change: $Author: vg $ $Date: 2003-04-15 13:31:32 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -119,16 +119,28 @@ RESLIB1SRSFILES= $(SRS)$/desktop.srs APP1TARGET=so$/$(TARGET) APP1STDLIBS= \ - $(APP1_STDPRE) \ - $(SVLLIB) \ - $(SVMEMLIB) \ $(VCLLIB) \ - $(APP1_STDPOST) \ + $(SVLLIB) \ $(UNOTOOLSLIB) \ - $(UCBHELPERLIB) \ + $(TOOLSLIB) \ $(COMPHELPERLIB) \ - $(SALHELPERLIB) \ - $(SVTOOLLIB) + $(UCBHELPERLIB) \ + $(VOSLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) + +# $(APP1_STDPRE) \ +# $(SVLLIB) \ +# $(SVMEMLIB) \ +# $(VCLLIB) \ +# $(APP1_STDPOST) \ +# $(UNOTOOLSLIB) \ +# $(UCBHELPERLIB) \ +# $(COMPHELPERLIB) \ +# $(SALHELPERLIB) \ +# $(SVTOOLLIB) + APP1OBJS=$(TARGETOBJS) APP1OBJS += $(OBJ)$/copyright_ascii_sun.obj @@ -158,7 +170,7 @@ APP1LINKRES=$(MISC)$/$(TARGET).res #$(BIN)$/$(TARGET).exe.manifest: template.manifest #+$(COPY) $< $@ -.ENDIF +.ENDIF # WNT .IF "$(GUI)" == "WNT" @@ -206,28 +218,40 @@ APP4LINKRES=$(MISC)$/$(APP4TARGET).res APP5TARGET=soffice APP5STDLIBS= \ - $(APP1_STDPRE) \ - $(SVLLIB) \ - $(SVMEMLIB) \ $(VCLLIB) \ - $(APP1_STDPOST) \ + $(SVLLIB) \ $(UNOTOOLSLIB) \ - $(UCBHELPERLIB) \ + $(TOOLSLIB) \ $(COMPHELPERLIB) \ - $(SALHELPERLIB) \ - $(SVTOOLLIB) + $(UCBHELPERLIB) \ + $(VOSLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) + +# $(APP1_STDPRE) \ +# $(SVLLIB) \ +# $(SVMEMLIB) \ +# $(VCLLIB) \ +# $(APP1_STDPOST) \ +# $(UNOTOOLSLIB) \ +# $(UCBHELPERLIB) \ +# $(COMPHELPERLIB) \ +# $(SALHELPERLIB) \ +# $(SVTOOLLIB) + APP5OBJS=$(TARGETOBJS) APP5OBJS += $(OBJ)$/copyright_ascii_ooo.obj .IF "$(GUI)" == "UNX" .IF "$(OS)" != "MACOSX" APP5OBJS += $(OBJ)$/icon_resource_ooo.obj -.ENDIF -.ENDIF +.ENDIF # MACOSX +.ENDIF # UNX .IF "$(OS)" == "LINUX" APP5STDLIBS+= -lXext -lSM -lICE -.ENDIF +.ENDIF # LINUX APP5DEPN= $(APP1RES) ooverinfo.rc APP5DEF= $(MISCX)$/$(TARGET).def @@ -237,7 +261,7 @@ APP5RES= $(RES)$/oodesktop.res APP5ICON=$(SOLARRESDIR)$/icons/ooo_gulls.ico APP5VERINFO=ooverinfo.rc APP5LINKRES=$(MISC)$/ooffice.res -.ENDIF +.ENDIF # WNT @@ -247,7 +271,7 @@ all: $(BIN)$/so ALLTAR ALLTAR: $(BIN)$/$(TARGET).exe.manifest -.ENDIF +.ENDIF # WNT # --- Targets ------------------------------------------------------------- @@ -256,7 +280,7 @@ ALLTAR: $(BIN)$/$(TARGET).exe.manifest .IF "$(GUI)" == "WNT" # create a manifest file with the same name as the -#office executable file soffice.exe.manifest +# office executable file soffice.exe.manifest $(BIN)$/$(TARGET).exe.manifest: template.manifest +$(COPY) $< $@ @@ -264,7 +288,8 @@ $(MISCX)$/$(APP1TARGET).def : makefile.mk echo NAME soffice >$@ echo DESCRIPTION 'StarDesktop Version 5' >>$@ echo DATA READ WRITE NONSHARED >>$@ -.ENDIF + +.ENDIF # WNT $(BIN)$/so: makefile.mk @echo APP5 : $(APP5TARGET) |