diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:17:08 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:17:08 +0000 |
| commit | 76f1ff5225849bc7b6a67d91cd4e4cac3ee3243d (patch) | |
| tree | 8d6852d1c127a6ad3fb35e877de992d62864d54a /desktop | |
| parent | ed093f6f46b4ded75373b737e2c18388281d8c98 (diff) | |
INTEGRATION: CWS ause076 (1.67.14); FILE MERGED
2007/02/28 10:57:19 hjs 1.67.14.1: #i74812# cleanup *LIB and more
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/util/makefile.mk | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 1738b80fb6c9..21df3a630e95 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.68 $ +# $Revision: 1.69 $ # -# last change: $Author: vg $ $Date: 2007-02-28 16:28:51 $ +# last change: $Author: obo $ $Date: 2007-03-09 09:17:08 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -96,17 +96,17 @@ LIB1FILES += $(OBJ)$/copyright_ascii_sun.obj LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//) .ENDIF # MACOSX -.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD" -# #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, -# winXX is handled like solaris for now -APP1_STDPRE= -APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \ - $(VOSLIB) $(SALLIB) -.ELSE -APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \ - $(CPPUHELPERLIB) -APP1_STDPOST= -.ENDIF +#.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD" +## #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, +## winXX is handled like solaris for now +#APP1_STDPRE= +#APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \ +# $(VOSLIB) $(SALLIB) +#.ELSE +#APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \ +# $(CPPUHELPERLIB) +#APP1_STDPOST= +#.ENDIF RESLIB1NAME= dkt RESLIB1IMAGES= $(PRJ)$/res @@ -133,7 +133,6 @@ APP1STDLIBS= \ # $(APP1_STDPRE) \ # $(SVLLIB) \ -# $(SVMEMLIB) \ # $(VCLLIB) \ # $(APP1_STDPOST) \ # $(UNOTOOLSLIB) \ @@ -151,7 +150,6 @@ APP1STDLIBS+= -lXext -lSM -lICE .ENDIF APP1DEPN= $(APP1RES) verinfo.rc -APP1DEF= $(MISCX)$/$(TARGET).def .IF "$(GUI)" == "WNT" APP1RES= $(RES)$/desktop.res @@ -226,14 +224,6 @@ APP7OBJS = \ STDLIB7=advapi32.lib .ENDIF # WNT -all: $(BIN)$/so ALLTAR - -.IF "$(GUI)" == "WNT" - -ALLTAR: $(MISC)$/$(TARGET).exe.manifest - -.ENDIF # WNT - # --- Targets ------------------------------------------------------------- .INCLUDE : target.mk @@ -292,11 +282,6 @@ $(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST) $(BIN)$/so$/$(TARGET).bin: $(BIN)$/so$/$(TARGET)$(EXECPOST) $(COPY) $< $@ -$(MISCX)$/$(APP1TARGET).def : makefile.mk - echo NAME soffice >$@ - echo DESCRIPTION 'StarDesktop Version 5' >>$@ - echo DATA READ WRITE NONSHARED >>$@ - .ENDIF # WNT $(BIN)$/so: makefile.mk |