From e94a19f3e0518d8c4e4a89eec4d6d8990071b00c Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 4 Oct 2011 23:41:53 +0200 Subject: simplfy dmake to gbuild bridgefile --- idl/prj/makefile.mk | 41 +------------------------------------ idl/source/prj/makefile.mk | 50 +--------------------------------------------- 2 files changed, 2 insertions(+), 89 deletions(-) (limited to 'idl') diff --git a/idl/prj/makefile.mk b/idl/prj/makefile.mk index d4cf94ec9f4e..0997622e00f6 100755 --- a/idl/prj/makefile.mk +++ b/idl/prj/makefile.mk @@ -1,40 +1 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. -TARGET=prj - -.INCLUDE : settings.mk - -.IF "$(VERBOSE)"!="" -VERBOSEFLAG := -.ELSE -VERBOSEFLAG := -s -.ENDIF - -all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog +.INCLUDE : gbuildbridge.mk diff --git a/idl/source/prj/makefile.mk b/idl/source/prj/makefile.mk index c33d2e9f3d7a..0997622e00f6 100755 --- a/idl/source/prj/makefile.mk +++ b/idl/source/prj/makefile.mk @@ -1,49 +1 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=idl -TARGET=prj -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS+=-DIDL_COMPILER -# --- Files -------------------------------------------------------------- - -OBJFILES= $(OBJ)$/command.obj \ - $(OBJ)$/svidl.obj \ - $(OBJ)$/globals.obj \ - $(OBJ)$/database.obj - -# --- Targets ------------------------------------------------------------ - -.INCLUDE : target.mk - +.INCLUDE : gbuildbridge.mk -- cgit