[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_offmgr binfilter/bf_sch binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svx binfilter/bf_sw binfilter/inc filter/source hwpfilter/source lotuswordpro/source writerfilter/qa xmerge/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Tue Feb 1 09:21:40 PST 2011


 binfilter/bf_basic/source/comp/makefile.mk      |    9 -------
 binfilter/bf_offmgr/util/makefile.mk            |    1 
 binfilter/bf_sch/source/ui/app/makefile.mk      |    2 -
 binfilter/bf_sfx2/source/appl/makefile.mk       |    1 
 binfilter/bf_sfx2/source/bastyp/makefile.mk     |    1 
 binfilter/bf_sfx2/source/config/makefile.mk     |    1 
 binfilter/bf_sfx2/source/control/makefile.mk    |    1 
 binfilter/bf_sfx2/source/doc/makefile.mk        |    1 
 binfilter/bf_sfx2/source/explorer/makefile.mk   |    1 
 binfilter/bf_sfx2/source/notify/makefile.mk     |    2 -
 binfilter/bf_sfx2/source/view/makefile.mk       |    2 -
 binfilter/bf_sfx2/util/makefile.mk              |    2 -
 binfilter/bf_sfx2/util/makefile.pmk             |   26 ----------------------
 binfilter/bf_so3/source/data/makefile.mk        |    2 -
 binfilter/bf_so3/source/dialog/makefile.mk      |    1 
 binfilter/bf_so3/source/inplace/makefile.mk     |    1 
 binfilter/bf_so3/source/misc/makefile.mk        |    2 -
 binfilter/bf_so3/source/ole/makefile.mk         |    2 -
 binfilter/bf_so3/source/persist/makefile.mk     |    1 
 binfilter/bf_so3/source/solink/makefile.mk      |    1 
 binfilter/bf_so3/util/makefile.mk               |    2 -
 binfilter/bf_so3/util/target.pmk                |   27 -----------------------
 binfilter/bf_svx/source/dialog/makefile.mk      |    1 
 binfilter/bf_svx/source/editeng/makefile.mk     |    1 
 binfilter/bf_svx/source/engine3d/makefile.mk    |    1 
 binfilter/bf_svx/source/form/makefile.mk        |    1 
 binfilter/bf_svx/source/items/makefile.mk       |    1 
 binfilter/bf_svx/source/options/makefile.mk     |    1 
 binfilter/bf_svx/source/outliner/makefile.mk    |    1 
 binfilter/bf_svx/source/svdraw/makefile.mk      |    1 
 binfilter/bf_svx/source/svxlink/makefile.mk     |    1 
 binfilter/bf_svx/source/unodraw/makefile.mk     |    1 
 binfilter/bf_svx/source/unoedit/makefile.mk     |    1 
 binfilter/bf_svx/source/xoutdev/makefile.mk     |    1 
 binfilter/bf_svx/util/makefile.pmk              |   28 ------------------------
 binfilter/bf_sw/source/core/swg/makefile.mk     |    1 
 binfilter/bf_sw/util/makefile.mk                |    6 -----
 binfilter/inc/bf_sw/sw.mk                       |    5 ----
 filter/source/graphicfilter/eps/makefile.mk     |    2 -
 filter/source/t602/makefile.mk                  |    1 
 filter/source/xsltdialog/makefile.mk            |    1 
 hwpfilter/source/makefile.mk                    |    1 
 lotuswordpro/source/filter/xfilter/makefile.mk  |    3 --
 writerfilter/qa/cppunittests/odiapi/makefile.mk |   11 ---------
 xmerge/source/activesync/makefile.mk            |    1 
 45 files changed, 161 deletions(-)

New commits:
commit 602ae9689ddc51ed7c7d1365d3a5615e6227d9cb
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 1 17:42:40 2011 +0100

    Clean up makefiles

diff --git a/binfilter/bf_basic/source/comp/makefile.mk b/binfilter/bf_basic/source/comp/makefile.mk
index 3e7377c..330af87 100644
--- a/binfilter/bf_basic/source/comp/makefile.mk
+++ b/binfilter/bf_basic/source/comp/makefile.mk
@@ -41,7 +41,6 @@ INC+= -I$(PRJ)$/inc$/bf_basic
 # --- Allgemein -----------------------------------------------------------
 
 EXCEPTIONSFILES=
-#EXCEPTIONSFILES=$(SLO)$/parser.obj
 
 SLOFILES= \
     $(EXCEPTIONSFILES) \
@@ -51,14 +50,6 @@ SLOFILES= \
     $(SLO)$/buffer.obj  \
    $(SLO)$/sbcomp.obj      \
 
-#    $(SLO)$/dim.obj			\
-    $(SLO)$/exprtree.obj		\
-    $(SLO)$/exprnode.obj		\
-    $(SLO)$/exprgen.obj		\
-    $(SLO)$/io.obj			\
-    $(SLO)$/loops.obj		\
-    $(SLO)$/symtbl.obj		\
-
 # --- Targets --------------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/binfilter/bf_offmgr/util/makefile.mk b/binfilter/bf_offmgr/util/makefile.mk
index c3b88b5..ecf59be 100644
--- a/binfilter/bf_offmgr/util/makefile.mk
+++ b/binfilter/bf_offmgr/util/makefile.mk
@@ -36,7 +36,6 @@ NO_HIDS=TRUE
 # --- Settings ------------------------------------------------------------
 
 .INCLUDE :	settings.mk
-#INC+= -I$(PRJ)$/inc$/bf_offmgr
 
 .IF "$(prjpch)" != ""
 CDEFS+=-DPRECOMPILED
diff --git a/binfilter/bf_sch/source/ui/app/makefile.mk b/binfilter/bf_sch/source/ui/app/makefile.mk
index dedf6f4..a30163f 100644
--- a/binfilter/bf_sch/source/ui/app/makefile.mk
+++ b/binfilter/bf_sch/source/ui/app/makefile.mk
@@ -44,8 +44,6 @@ BMP_IN =$(BFPRJ)$/res
 INC+= -I$(PRJ)$/inc$/bf_sch
 # --- Files --------------------------------------------------------
 
-#IMGLST_SRS=$(SRS)$/app.srs
-
 SRS1NAME=$(TARGET)
 SRC1FILES =	sch_app.src		\
         sch_strings.src
diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
index 3887a34..308025c 100644
--- a/binfilter/bf_so3/util/makefile.mk
+++ b/binfilter/bf_so3/util/makefile.mk
@@ -33,7 +33,6 @@ PRJNAME=binfilter
 TARGET=bf_so
 
 USE_LDUMP2=TRUE
-#LDUMP2=LDUMP3
 
 # --- Settings -----------------------------------------------------
 
diff --git a/binfilter/bf_sw/source/core/swg/makefile.mk b/binfilter/bf_sw/source/core/swg/makefile.mk
index 5f6898b..c516a31 100644
--- a/binfilter/bf_sw/source/core/swg/makefile.mk
+++ b/binfilter/bf_sw/source/core/swg/makefile.mk
@@ -36,7 +36,6 @@ TARGET=sw_swg
 NO_HIDS=TRUE
 
 AUTOSEG=true
-#ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 
diff --git a/binfilter/bf_sw/util/makefile.mk b/binfilter/bf_sw/util/makefile.mk
index 3e6756e..413931e 100644
--- a/binfilter/bf_sw/util/makefile.mk
+++ b/binfilter/bf_sw/util/makefile.mk
@@ -129,12 +129,6 @@ SHL2DEPN=   \
         $(SLB)$/sw_ui.lib
 
 
-#SHL2OBJS= \
-#	$(OUT)$/slo$/sw_swmodule.obj \
-#	$(OUT)$/slo$/sw_swdll.obj
-#	$(SLO)$/sw_.obj		  ^ \ nicht vergessen!
-
-
 SHL2DEF=    $(MISC)$/$(SHL2TARGET).def
 SHL2BASE=	0x1e000000
 
diff --git a/binfilter/inc/bf_sw/sw.mk b/binfilter/inc/bf_sw/sw.mk
index 772e16b..de3b563 100644
--- a/binfilter/inc/bf_sw/sw.mk
+++ b/binfilter/inc/bf_sw/sw.mk
@@ -25,11 +25,6 @@
 #
 #*************************************************************************
 
-# CDEFS=$(CDEFS) -DXXX
-
-# Bereiche aktivieren
-
-#CDEFS+=-DXML_CORE_API
 CDEFS+=-DNUM_RELSPACE
 CDEFS+=-DVERTICAL_LAYOUT
 CDEFS+=-DACCESSIBLE_LAYOUT
diff --git a/filter/source/graphicfilter/eps/makefile.mk b/filter/source/graphicfilter/eps/makefile.mk
index 1c58e61..0124a1e 100644
--- a/filter/source/graphicfilter/eps/makefile.mk
+++ b/filter/source/graphicfilter/eps/makefile.mk
@@ -31,8 +31,6 @@ PRJNAME=filter
 TARGET=eps
 DEPTARGET=veps
 
-#GEN_HID=TRUE
-
 # --- Settings -----------------------------------------------------------
 
 .INCLUDE :	settings.mk
diff --git a/filter/source/t602/makefile.mk b/filter/source/t602/makefile.mk
index c65de1b..f5ee624 100644
--- a/filter/source/t602/makefile.mk
+++ b/filter/source/t602/makefile.mk
@@ -48,7 +48,6 @@ SHL1OBJS=$(SLOFILES)
 SHL1TARGET=$(LIBNAME)$(DLLPOSTFIX)
 SHL1IMPLIB=i$(LIBNAME)
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-#SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
 SHL1STDLIBS= \
diff --git a/filter/source/xsltdialog/makefile.mk b/filter/source/xsltdialog/makefile.mk
index 728a94b..d4ee83a 100644
--- a/filter/source/xsltdialog/makefile.mk
+++ b/filter/source/xsltdialog/makefile.mk
@@ -31,7 +31,6 @@ TARGET=xsltdlg
 
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
-#GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
 
 # --- Settings ----------------------------------
diff --git a/hwpfilter/source/makefile.mk b/hwpfilter/source/makefile.mk
index 98b00d0..eaab1d3 100644
--- a/hwpfilter/source/makefile.mk
+++ b/hwpfilter/source/makefile.mk
@@ -72,7 +72,6 @@ SLOFILES =	\
 # --- Shared-Library -----------------------------------------------
 
 SHL1TARGET= $(TARGET)
-#SHL1IMPLIB= ihwp
 
 SHL1STDLIBS= \
         $(CPPULIB)		\
diff --git a/lotuswordpro/source/filter/xfilter/makefile.mk b/lotuswordpro/source/filter/xfilter/makefile.mk
index 898ef9b..43bc150 100644
--- a/lotuswordpro/source/filter/xfilter/makefile.mk
+++ b/lotuswordpro/source/filter/xfilter/makefile.mk
@@ -59,9 +59,6 @@ PRJ=..$/..$/..
 PRJNAME=lotuswordpro
 TARGET=xfilter
 
-
-#ENABLE_EXCEPTIONS=TRUE
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk
index 6fc9adc..4c8be2b 100644
--- a/writerfilter/qa/cppunittests/odiapi/makefile.mk
+++ b/writerfilter/qa/cppunittests/odiapi/makefile.mk
@@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
-    #CFLAGS+=/Ob1
-.ENDIF
-
 SHL1OBJS=\
     $(SLO)$/testProperty.obj \
     $(SLO)$/FileLoggerImpl.obj\
@@ -62,14 +55,10 @@ SHL1STDLIBS+=$(LB)$/libodiapi.dylib
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
 DEF1NAME    =$(SHL1TARGET)
 
 SHL1VERSIONMAP = export.map
 
-# END ------------------------------------------------------------------
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/xmerge/source/activesync/makefile.mk b/xmerge/source/activesync/makefile.mk
index 18d904f..275dcd3 100644
--- a/xmerge/source/activesync/makefile.mk
+++ b/xmerge/source/activesync/makefile.mk
@@ -27,7 +27,6 @@
 
 PRJ	= ..$/.. 
 PRJNAME = xmerge
-#PACKAGE = com$/sun$/star$/documentconversion$/XSLTFilter
 TARGET  = xmergesync 
 ENABLE_EXCEPTIONS=TRUE
 LIBTARGET=NO
commit 5f726275bb6c49fcb0bab353d2c69b7dd0b9128f
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 1 17:08:25 2011 +0100

    Remove empty makefiles and their references.

diff --git a/binfilter/bf_sfx2/source/appl/makefile.mk b/binfilter/bf_sfx2/source/appl/makefile.mk
index 8807c19..22e044b 100644
--- a/binfilter/bf_sfx2/source/appl/makefile.mk
+++ b/binfilter/bf_sfx2/source/appl/makefile.mk
@@ -34,7 +34,6 @@ TARGET=sfx2_appl
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 
 # --- Settings -----------------------------------------------------
 
diff --git a/binfilter/bf_sfx2/source/bastyp/makefile.mk b/binfilter/bf_sfx2/source/bastyp/makefile.mk
index 780940c..51843fa 100644
--- a/binfilter/bf_sfx2/source/bastyp/makefile.mk
+++ b/binfilter/bf_sfx2/source/bastyp/makefile.mk
@@ -36,7 +36,6 @@ TARGET=sfx2_bastyp
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 
 # --- Settings -----------------------------------------------------
 
diff --git a/binfilter/bf_sfx2/source/config/makefile.mk b/binfilter/bf_sfx2/source/config/makefile.mk
index 7efeb25..43179d0 100644
--- a/binfilter/bf_sfx2/source/config/makefile.mk
+++ b/binfilter/bf_sfx2/source/config/makefile.mk
@@ -34,7 +34,6 @@ TARGET=sfx2_config
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 
 # --- Settings -----------------------------------------------------
 
diff --git a/binfilter/bf_sfx2/source/control/makefile.mk b/binfilter/bf_sfx2/source/control/makefile.mk
index fa4771c..f13e205 100644
--- a/binfilter/bf_sfx2/source/control/makefile.mk
+++ b/binfilter/bf_sfx2/source/control/makefile.mk
@@ -34,7 +34,6 @@ TARGET=sfx2_control
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 
 # --- Settings -----------------------------------------------------
 
diff --git a/binfilter/bf_sfx2/source/doc/makefile.mk b/binfilter/bf_sfx2/source/doc/makefile.mk
index a8d239d..926b267 100644
--- a/binfilter/bf_sfx2/source/doc/makefile.mk
+++ b/binfilter/bf_sfx2/source/doc/makefile.mk
@@ -34,7 +34,6 @@ TARGET=sfx2_doc
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 
 # --- Settings -----------------------------------------------------
 
diff --git a/binfilter/bf_sfx2/source/explorer/makefile.mk b/binfilter/bf_sfx2/source/explorer/makefile.mk
index e2b379f..62d4950 100644
--- a/binfilter/bf_sfx2/source/explorer/makefile.mk
+++ b/binfilter/bf_sfx2/source/explorer/makefile.mk
@@ -34,7 +34,6 @@ TARGET=sfx2_explorer
 NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 
 # --- Settings -----------------------------------------------------
 
diff --git a/binfilter/bf_sfx2/source/notify/makefile.mk b/binfilter/bf_sfx2/source/notify/makefile.mk
index e230f47..5e995e0 100644
--- a/binfilter/bf_sfx2/source/notify/makefile.mk
+++ b/binfilter/bf_sfx2/source/notify/makefile.mk
@@ -33,8 +33,6 @@ TARGET=sfx2_notify
 
 NO_HIDS=TRUE
 
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/binfilter/bf_sfx2/source/view/makefile.mk b/binfilter/bf_sfx2/source/view/makefile.mk
index 91e1551..f99e036 100644
--- a/binfilter/bf_sfx2/source/view/makefile.mk
+++ b/binfilter/bf_sfx2/source/view/makefile.mk
@@ -35,8 +35,6 @@ NO_HIDS=TRUE
 
 ENABLE_EXCEPTIONS=	TRUE
 
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/binfilter/bf_sfx2/util/makefile.mk b/binfilter/bf_sfx2/util/makefile.mk
index 1859666..780bcb6 100644
--- a/binfilter/bf_sfx2/util/makefile.mk
+++ b/binfilter/bf_sfx2/util/makefile.mk
@@ -35,8 +35,6 @@ TARGET=bf_sfx
 
 NO_HIDS=TRUE
 
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/binfilter/bf_sfx2/util/makefile.pmk b/binfilter/bf_sfx2/util/makefile.pmk
deleted file mode 100644
index 1b35ca4..0000000
--- a/binfilter/bf_sfx2/util/makefile.pmk
+++ /dev/null
@@ -1,26 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
diff --git a/binfilter/bf_so3/source/data/makefile.mk b/binfilter/bf_so3/source/data/makefile.mk
index 76fd3a3..ed1761b 100644
--- a/binfilter/bf_so3/source/data/makefile.mk
+++ b/binfilter/bf_so3/source/data/makefile.mk
@@ -34,8 +34,6 @@ TARGET=so3_data
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
-.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
-
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/dialog/makefile.mk b/binfilter/bf_so3/source/dialog/makefile.mk
index 94d3089..216a24d 100644
--- a/binfilter/bf_so3/source/dialog/makefile.mk
+++ b/binfilter/bf_so3/source/dialog/makefile.mk
@@ -35,7 +35,6 @@ TARGET=so3_dialog
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
-.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/inplace/makefile.mk b/binfilter/bf_so3/source/inplace/makefile.mk
index 4428adc..0d56060 100644
--- a/binfilter/bf_so3/source/inplace/makefile.mk
+++ b/binfilter/bf_so3/source/inplace/makefile.mk
@@ -35,7 +35,6 @@ TARGET=so3_inplace
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
-.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/misc/makefile.mk b/binfilter/bf_so3/source/misc/makefile.mk
index d73c6b0..167c54d 100644
--- a/binfilter/bf_so3/source/misc/makefile.mk
+++ b/binfilter/bf_so3/source/misc/makefile.mk
@@ -35,8 +35,6 @@ TARGET=so3_misc
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
-.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
-
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/ole/makefile.mk b/binfilter/bf_so3/source/ole/makefile.mk
index 7cbfe10..cc66625 100644
--- a/binfilter/bf_so3/source/ole/makefile.mk
+++ b/binfilter/bf_so3/source/ole/makefile.mk
@@ -35,8 +35,6 @@ TARGET=so3_ole
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
-.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
-
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/persist/makefile.mk b/binfilter/bf_so3/source/persist/makefile.mk
index c33ada6..9dae4cf 100644
--- a/binfilter/bf_so3/source/persist/makefile.mk
+++ b/binfilter/bf_so3/source/persist/makefile.mk
@@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 .IF "$(NO_DLL)" == "NO_DLL"
 SLO=$(OBJ)
diff --git a/binfilter/bf_so3/source/solink/makefile.mk b/binfilter/bf_so3/source/solink/makefile.mk
index d21354b..59beaa8 100644
--- a/binfilter/bf_so3/source/solink/makefile.mk
+++ b/binfilter/bf_so3/source/solink/makefile.mk
@@ -42,7 +42,6 @@ OPTLINKS=YES
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
index 6b92173..3887a34 100644
--- a/binfilter/bf_so3/util/makefile.mk
+++ b/binfilter/bf_so3/util/makefile.mk
@@ -38,7 +38,6 @@ USE_LDUMP2=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 RSCFLAGS+=-p
 
diff --git a/binfilter/bf_so3/util/target.pmk b/binfilter/bf_so3/util/target.pmk
deleted file mode 100644
index fe9f60b..0000000
--- a/binfilter/bf_so3/util/target.pmk
+++ /dev/null
@@ -1,27 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
diff --git a/binfilter/bf_svx/source/dialog/makefile.mk b/binfilter/bf_svx/source/dialog/makefile.mk
index 97b024e..4bdb03e 100644
--- a/binfilter/bf_svx/source/dialog/makefile.mk
+++ b/binfilter/bf_svx/source/dialog/makefile.mk
@@ -36,7 +36,6 @@ NO_HIDS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 .IF "$(GUI)" != "MAC"
diff --git a/binfilter/bf_svx/source/editeng/makefile.mk b/binfilter/bf_svx/source/editeng/makefile.mk
index 897b969..4f65c41 100644
--- a/binfilter/bf_svx/source/editeng/makefile.mk
+++ b/binfilter/bf_svx/source/editeng/makefile.mk
@@ -43,7 +43,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Allgemein ----------------------------------------------------------
diff --git a/binfilter/bf_svx/source/engine3d/makefile.mk b/binfilter/bf_svx/source/engine3d/makefile.mk
index 5c97951..52a894e 100644
--- a/binfilter/bf_svx/source/engine3d/makefile.mk
+++ b/binfilter/bf_svx/source/engine3d/makefile.mk
@@ -36,7 +36,6 @@ NO_HIDS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_svx/source/form/makefile.mk b/binfilter/bf_svx/source/form/makefile.mk
index 3824b18..d88d677 100644
--- a/binfilter/bf_svx/source/form/makefile.mk
+++ b/binfilter/bf_svx/source/form/makefile.mk
@@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_svx/source/items/makefile.mk b/binfilter/bf_svx/source/items/makefile.mk
index 481eb2a..a5e419d 100644
--- a/binfilter/bf_svx/source/items/makefile.mk
+++ b/binfilter/bf_svx/source/items/makefile.mk
@@ -40,7 +40,6 @@ NO_HIDS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_svx/source/options/makefile.mk b/binfilter/bf_svx/source/options/makefile.mk
index 5121589..af66cc9 100644
--- a/binfilter/bf_svx/source/options/makefile.mk
+++ b/binfilter/bf_svx/source/options/makefile.mk
@@ -40,7 +40,6 @@ NO_HIDS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 CFLAGS+=-DDG_DLL
diff --git a/binfilter/bf_svx/source/outliner/makefile.mk b/binfilter/bf_svx/source/outliner/makefile.mk
index 1c42961..fb42540 100644
--- a/binfilter/bf_svx/source/outliner/makefile.mk
+++ b/binfilter/bf_svx/source/outliner/makefile.mk
@@ -41,7 +41,6 @@ PROJECTPCHSOURCE=svx_outl_pch
 # --- Settings -----------------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Allgemein ----------------------------------------------------------
diff --git a/binfilter/bf_svx/source/svdraw/makefile.mk b/binfilter/bf_svx/source/svdraw/makefile.mk
index a358b08..ae4476d 100644
--- a/binfilter/bf_svx/source/svdraw/makefile.mk
+++ b/binfilter/bf_svx/source/svdraw/makefile.mk
@@ -36,7 +36,6 @@ NO_HIDS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_svx/source/svxlink/makefile.mk b/binfilter/bf_svx/source/svxlink/makefile.mk
index 597100b..fcd6e01 100644
--- a/binfilter/bf_svx/source/svxlink/makefile.mk
+++ b/binfilter/bf_svx/source/svxlink/makefile.mk
@@ -39,7 +39,6 @@ NO_HIDS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_svx/source/unodraw/makefile.mk b/binfilter/bf_svx/source/unodraw/makefile.mk
index 9e04015..e702522 100644
--- a/binfilter/bf_svx/source/unodraw/makefile.mk
+++ b/binfilter/bf_svx/source/unodraw/makefile.mk
@@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_svx/source/unoedit/makefile.mk b/binfilter/bf_svx/source/unoedit/makefile.mk
index b22daea..c141120 100644
--- a/binfilter/bf_svx/source/unoedit/makefile.mk
+++ b/binfilter/bf_svx/source/unoedit/makefile.mk
@@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_svx/source/xoutdev/makefile.mk b/binfilter/bf_svx/source/xoutdev/makefile.mk
index ca161a0..2f51318 100644
--- a/binfilter/bf_svx/source/xoutdev/makefile.mk
+++ b/binfilter/bf_svx/source/xoutdev/makefile.mk
@@ -37,7 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
 INC+= -I$(PRJ)$/inc$/bf_svx
 
 # --- Files --------------------------------------------------------
diff --git a/binfilter/bf_svx/util/makefile.pmk b/binfilter/bf_svx/util/makefile.pmk
deleted file mode 100644
index 7653d1c..0000000
--- a/binfilter/bf_svx/util/makefile.pmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-


More information about the Libreoffice-commits mailing list