summaryrefslogtreecommitdiff
path: root/desktop/util
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-21 16:02:40 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 19:55:34 -0500
commit1df23c08d442cc3e5d3714b54b8d5ab73327b954 (patch)
treef8a92489802a454e2d3d4e5a5bcd9e47884ad294 /desktop/util
parent119873328acd70ca3569c21a0b1fe36277e8bf4c (diff)
Finally, gut the vos module out of the build
Diffstat (limited to 'desktop/util')
-rw-r--r--desktop/util/makefile.mk14
1 files changed, 1 insertions, 13 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 480fee550c46..3d4950cb40f0 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -57,18 +57,6 @@ RCFILES=ooverinfo2.rc
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
-
RESLIB1NAME= dkt
RESLIB1IMAGES= $(PRJ)$/res
RESLIB1SRSFILES= $(SRS)$/desktop.srs
@@ -218,7 +206,7 @@ ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
.IF "$(LINK_SO)"=="TRUE"
$(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN)
$(COPY) $< $@
-
+
ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST)
.ENDIF # "$(LINK_SO)"=="TRUE"