diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 23:41:53 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-05 00:31:50 +0200 |
| commit | e94a19f3e0518d8c4e4a89eec4d6d8990071b00c (patch) | |
| tree | 5d9d430f18e5efa6921fc5cacddf99a80a22b456 /sc | |
| parent | 23af3341322143f2edde5a6c6668294c915c3ae5 (diff) | |
simplfy dmake to gbuild bridgefile
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/Module_sc.mk | 2 | ||||
| -rw-r--r-- | sc/prj/makefile.mk | 41 |
2 files changed, 2 insertions, 41 deletions
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 1edf6465592d..1a3d4c282de5 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Module_add_targets,sc,\ Package_xml \ )) -$(eval $(call gb_Module_add_check_targets,sc,\ +#$(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_filters_test \ CppunitTest_sc_ucalc \ RdbTarget_sc_filters_test \ diff --git a/sc/prj/makefile.mk b/sc/prj/makefile.mk index ffd9fb276d8a..0997622e00f6 100644 --- a/sc/prj/makefile.mk +++ b/sc/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 -# <http://www.openoffice.org/license.html> -# 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 |