INTEGRATION: CWS vcl88 (1.30.26); FILE MERGED
2008/04/17 05:52:11 pl 1.30.26.3: RESYNC: (1.31-1.32); FILE MERGED 2008/04/10 12:59:17 pl 1.30.26.2: RESYNC: (1.30-1.31); FILE MERGED 2008/04/03 13:57:56 pl 1.30.26.1: remove unneeded files
This commit is contained in:
parent
23423b5c50
commit
bddc4feb58
1 changed files with 1 additions and 13 deletions
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.32 $
|
||||
# $Revision: 1.33 $
|
||||
#
|
||||
# This file is part of OpenOffice.org.
|
||||
#
|
||||
|
@ -100,14 +100,6 @@ CDEFS+=-DUSE_XINERAMA_XSUN
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(OS)$(CPU)" == "SOLARISS"
|
||||
.IF "$(COM)"!="GCC"
|
||||
SLOFILES+=$(SLO)$/getfpsols.obj
|
||||
.ENDIF # "$(COM)"!="GCC"
|
||||
.ELIF "$(OS)$(CPU)" == "SOLARISI"
|
||||
SLOFILES+=$(SLO)$/getfpsoli.obj
|
||||
.ENDIF
|
||||
|
||||
.ENDIF # "$(GUIBASE)"!="unx"
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
@ -116,7 +108,3 @@ SLOFILES+=$(SLO)$/getfpsoli.obj
|
|||
|
||||
.INCLUDE : $(PRJ)$/util$/target.pmk
|
||||
|
||||
# local rule to create the additional object file for SOLARIS
|
||||
$(SLO)$/%.obj: %.s
|
||||
$(CXX) -c -o $(@:s/.obj/.o/) $< && touch $@
|
||||
|
||||
|
|
Loading…
Reference in a new issue