diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-28 17:35:51 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-16 13:40:40 +0200 |
| commit | 586bed9157edc406fe83ee2c674f6e976d27b5be (patch) | |
| tree | 19a63f13b3523974546b8b64fcf588c4a434dc3b /regexp/source | |
| parent | ba450e160447eb8108ab1dd548daccf86c6435d6 (diff) | |
CWS gnumake4: convert regexp to new build system [hg:56e4316f8d74]
Diffstat (limited to 'regexp/source')
| -rw-r--r-- | regexp/source/makefile.mk | 70 | ||||
| -rw-r--r-- | regexp/source/reclass.cxx | 7 |
2 files changed, 1 insertions, 76 deletions
diff --git a/regexp/source/makefile.mk b/regexp/source/makefile.mk deleted file mode 100644 index 7aa2a2eaa03b..000000000000 --- a/regexp/source/makefile.mk +++ /dev/null @@ -1,70 +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. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=regexp -TARGET=i18nregexp -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/reclass.obj - -SLOFILES= \ - $(EXCEPTIONSFILES) - -SHL1TARGET= $(TARGET)$(COMID) -SHL1IMPLIB= i$(TARGET) -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME= $(SHL1TARGET) - -SHL1OBJS= $(SLOFILES) - -LIB1TARGET= $(SLB)$/$(SHL1TARGET).lib -LIB1OBJFILES= $(SHL1OBJS) - -SHL1STDLIBS= \ - $(SALLIB) \ - $(I18NUTILLIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - @echo CLEAR_THE_FILE > $@ - @echo __CT >> $@ diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx index b376c2d05881..bed4451ea2d1 100644 --- a/regexp/source/reclass.cxx +++ b/regexp/source/reclass.cxx @@ -25,9 +25,6 @@ * ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_regexp.hxx" /* Extended regular expression matching and search library, version 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the @@ -53,6 +50,7 @@ Modified for OpenOffice.org to use sal_Unicode and Transliteration service. */ +#include <regexp/reclass.hxx> #if 0 /* If for any reason (porting, debug) we can't use alloca() use malloc() @@ -74,9 +72,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> -#include "reclass.hxx" - - /* Maximum number of duplicates an interval can allow. Some systems (erroneously) define this in other header files, but we want our value, so remove any previous define. */ |