[Libreoffice-commits] core.git: 4 commits - cairo/cairo cairo/pixman configure.ac filter/source m4/libo_check_extension.m4 xmloff/source
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Mon Feb 18 07:46:13 PST 2013
cairo/cairo/makefile.mk | 277 ---------------------------
cairo/pixman/makefile.mk | 190 ------------------
configure.ac | 170 +---------------
filter/source/config/tools/split/makefile.mk | 79 -------
m4/libo_check_extension.m4 | 23 ++
xmloff/source/chart/makefile.mk | 64 ------
6 files changed, 36 insertions(+), 767 deletions(-)
New commits:
commit 1c0dbe46298c71c3bec26f324927ce2562c611b6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 18 16:42:37 2013 +0100
remove stray makefile.mk in xmloff
Change-Id: Ic675c30449810fb979f97f53cab5f4eb8c77593b
diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk
deleted file mode 100644
index f3fa755..0000000
--- a/xmloff/source/chart/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..$/..
-PRJNAME = xmloff
-TARGET = chart
-AUTOSEG = true
-ENABLE_EXCEPTIONS = TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(SLO)$/ColorPropertySet.obj \
- $(SLO)$/SchXMLTools.obj \
- $(SLO)$/SchXMLExport.obj \
- $(SLO)$/SchXMLImport.obj \
- $(SLO)$/contexts.obj \
- $(SLO)$/SchXMLTableContext.obj \
- $(SLO)$/SchXMLChartContext.obj \
- $(SLO)$/SchXMLLegendContext.obj \
- $(SLO)$/SchXMLPlotAreaContext.obj \
- $(SLO)$/SchXMLAxisContext.obj \
- $(SLO)$/SchXMLParagraphContext.obj \
- $(SLO)$/SchXMLTextListContext.obj \
- $(SLO)$/SchXMLSeriesHelper.obj \
- $(SLO)$/SchXMLSeries2Context.obj \
- $(SLO)$/SchXMLEnumConverter.obj \
- $(SLO)$/PropertyMaps.obj \
- $(SLO)$/XMLChartStyleContext.obj \
- $(SLO)$/XMLErrorIndicatorPropertyHdl.obj \
- $(SLO)$/XMLErrorBarStylePropertyHdl.obj \
- $(SLO)$/SchXMLAutoStylePoolP.obj \
- $(SLO)$/XMLChartPropertyContext.obj \
- $(SLO)$/XMLSymbolImageContext.obj \
- $(SLO)$/XMLLabelSeparatorContext.obj \
- $(SLO)$/XMLTextOrientationHdl.obj \
- $(SLO)$/XMLSymbolTypePropertyHdl.obj \
- $(SLO)$/XMLAxisPositionPropertyHdl.obj \
- $(SLO)$/SchXMLCalculationSettingsContext.obj \
- $(SLO)$/transporttypes.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
commit 72b92cbc70615717ac8d592292bde2638c6c4f72
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 18 16:42:13 2013 +0100
remove stray makefile.mk in filter
Change-Id: I2a9796a4f12f3b364a2b8828189bbd6d6e1ace57
diff --git a/filter/source/config/tools/split/makefile.mk b/filter/source/config/tools/split/makefile.mk
deleted file mode 100644
index 2ae172a..0000000
--- a/filter/source/config/tools/split/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..$/..$/..$/..
-PRJNAME = filter
-TARGET = FCFGSplit
-PACKAGE = com$/sun$/star$/filter$/config$/tools$/split
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-OWNCOPY = \
- $(MISC)$/$(TARGET)_copied.done
-
-JARFILES = \
- ridl.jar \
- unoil.jar \
- jurt.jar \
- juh.jar \
- java_uno.jar
-
-CFGFILES = \
- FCFGSplit.cfg
-
-JAVACLASSFILES = \
- $(CLASSDIR)$/$(PACKAGE)$/SplitterData.class \
- $(CLASSDIR)$/$(PACKAGE)$/Splitter.class \
- $(CLASSDIR)$/$(PACKAGE)$/FCFGSplit.class
-
-CUSTOMMANIFESTFILE = \
- Manifest.mf
-
-MAXLINELENGTH = 100000
-
-#----- make a jar from compiled files ------------------------------
-
-JARCLASSDIRS = \
- com$/sun$/star$/filter$/config$/tools$/utils \
- com$/sun$/star$/filter$/config$/tools$/split
-
-JARTARGET = $(TARGET).jar
-
-JARCOMPRESS = TRUE
-
-# --- targets -----------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(OWNCOPY)
-
-.IF "$(JARTARGETN)" != ""
-$(JARTARGETN) : $(OWNCOPY)
-.ENDIF
-
-$(OWNCOPY) : $(CFGFILES)
- -$(MKDIR) $(CLASSDIR)$/$(PACKAGE)
- $(COPY) $? $(CLASSDIR)$/$(PACKAGE) && $(TOUCH) $@
-
-run :
- @$(MKDIR) c:\temp\fragments
- @$(JAVA) -jar $(CLASSDIR)$/FCFGSplit.jar debug=4 xmlfile=o:/src680/src.m7/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu outdir=c:/temp/fragments
commit d335c2a02a73fec6cf4bf52025a78f56d5649de0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Feb 18 16:39:50 2013 +0100
remove stray makefile.mk in cairo
Change-Id: Ie920fbdf140db81bc4426048a6c0e05f9a823d7d
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
deleted file mode 100644
index 99ddb9e..0000000
--- a/cairo/cairo/makefile.mk
+++ /dev/null
@@ -1,277 +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=cairo
-TARGET=so_cairo
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_CAIRO)" == "YES"
-all:
- @echo "Not building cairo."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-CAIROVERSION=1.10.2
-
-TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
-TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
-
-PATCH_FILES=\
- ..$/cairo-1.10.2.patch \
- ..$/cairo.dlsym.lcdfilter.patch \
- ..$/cairo-1.10.2-oldfontconfig.patch
-
-.IF "$(OS)$(COM)" == "WNTMSC"
-PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
-.ENDIF
-
-.IF "$(OS)" == "IOS"
-PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch
-PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch
-.ENDIF
-
-.IF "$(OS)" == "ANDROID"
-PATCH_FILES+=..$/$(TARFILE_NAME).android.patch
-.ENDIF
-
-cairo_CFLAGS=$(SOLARINC)
-cairo_LDFLAGS=-L$(SOLARVER)$/$(INPATH)$/lib
-
-cairo_CPPFLAGS=
-
-.IF "$(SYSTEM_ZLIB)"!="YES"
-cairo_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib
-cairo_COMPRESS=z_compress
-.ELSE
-cairo_COMPRESS=compress
-.ENDIF
-cairo_CPPFLAGS+=$(INCLUDE)
-
-.IF "$(OS)"=="WNT"
-# --------- Windows -------------------------------------------------
-.IF "$(COM)"=="GCC"
-cairo_LDFLAGS+=-no-undefined -L$(ILIB:s/;/ -L/)
-cairo_CPPFLAGS+=-nostdinc
-cairo_CC=$(CC) -mthreads
-
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-cairo_CC+=-shared-libgcc
-.ENDIF
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-cairo_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
-CONFIGURE_FLAGS=--disable-valgrind --disable-xlib --disable-ft --disable-pthread --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config CC="$(cairo_CC)" LIBS="$(cairo_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump"
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-.IF "$(OS)$(COM)"=="WNTGCC"
-.EXPORT : PWD
-.ENDIF
-
-.ELSE # WNT, not GCC
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=$(ZLIB3RDLIB)
-BUILD_DIR=
-.ENDIF
-
-OUT2INC+=src$/cairo-win32.h
-
-.ELIF "$(OS)"=="MACOSX"
-# ----------- Mac OS X --------------------------------
-.IF "$(SYSBASE)"!=""
-.IF "$(EXTRA_CFLAGS)" != ""
-cairo_CFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
-cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
-.ENDIF # "$(EXTRA_CFLAGS)" != ""
-.ENDIF # "$(SYSBASE)"!=""
-CONFIGURE_DIR=
-CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
-.IF $(MACOSX_SDK_VERSION) >= 1070
-PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch
-.ENDIF
-CONFIGURE_FLAGS=--enable-static=no --disable-valgrind --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-cairo_CPPFLAGS+=$(EXTRA_CDEFS)
-cairo_LDFLAGS+=$(EXTRA_LINKFLAGS)
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-
-OUT2INC+=src$/cairo-quartz.h
-
-.ELSE
-# ----------- Unix ---------------------------------------------------------
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-cairo_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib -Wl,-z,noexecstack
-.ELIF "$(OS)$(COM)"=="SOLARISC52"
-cairo_LDFLAGS+=-Wl,-R\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib
-.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-
-.IF "$(SYSBASE)"!=""
-cairo_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS)
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
-cairo_LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl
-.ENDIF
-.ENDIF # "$(SYSBASE)"!=""
-
-LDFLAGS:=$(cairo_LDFLAGS)
-.EXPORT: LDFLAGS
-
-.IF "$(COMNAME)"=="sunpro5"
-cairo_CFLAGS+=-xc99=none
-.ENDIF
-
-.IF "$(CPUNAME)"=="INTEL"
-cairo_CFLAGS+=-march=i486
-.ENDIF
-
-CONFIGURE_DIR=
-
-.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-# No pkg-config on MacOSX (for iOS) or in the Android NDK
-CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
-.ELSE
-CONFIGURE_ACTION=.$/configure
-.ENDIF
-
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-
-.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-CONFIGURE_FLAGS+=--disable-xlib
-.ELSE
-CONFIGURE_FLAGS+=--enable-xlib
-.ENDIF
-
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS+=--enable-quartz --enable-quartz-font
-.ENDIF
-
-CONFIGURE_FLAGS+=--disable-valgrind
-
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS+=--disable-ft
-.ELSE
-CONFIGURE_FLAGS+=--enable-ft --enable-fc
-.ENDIF
-
-.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-CONFIGURE_FLAGS+=PKG_CONFIG=./dummy_pkg_config
-.ENDIF
-
-CONFIGURE_FLAGS+=--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-
-.IF "$(OS)" == "IOS"
-OUT2INC+=src$/cairo-quartz.h
-.ELSE
-OUT2INC+=src$/cairo-xlib.h \
- src$/cairo-xlib-xrender.h \
- src$/cairo-ft.h
-.ENDIF
-
-.ENDIF
-
-
-# -------- All platforms --------------------------------------------
-
-.IF "$(OS)" != "WNT" || "$(COM)" == "GCC"
-# all other platforms except vanilla WNT, which does not use configure
-
-# pixman is in this module
-# We include paths to this module also in LDFLAGS/CFLAGS to guarantee search order.
-# However pixman_* vars need to be also set for configure to work properly on all platforms.
-CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1"
-
-.IF "$(debug)"!=""
-cairo_CFLAGS+=-g
-CONFIGURE_FLAGS+= STRIP=" "
-.ENDIF
-
-CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS='-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)' CPPFLAGS="$(cairo_CPPFLAGS)"
-
-.ENDIF
-
-.IF "$(SYSTEM_LIBPNG)" != "YES"
-CONFIGURE_FLAGS+=png_CFLAGS="-I$(SOLARINCDIR)$/external$/libpng" png_LIBS="-L$(SOLARLIBDIR) -lpng"
-.ENDIF
-
-.IF "$(OS)" == "MACOSX"
-CONFIGURE_FLAGS += \
- --prefix=/@.__________________________________________________$(EXTRPATH)
-.END
-
-OUT2INC+=cairo-version.h \
- src$/cairo-deprecated.h \
- src$/cairo-features.h \
- src$/cairo-pdf.h \
- src$/cairo-ps.h \
- src$/cairo.h
-
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libcairo*.dylib
-.ELIF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OUT2BIN+=src$/.libs$/*.a
-OUT2BIN+=src$/.libs$/*.dll
-.ELSE
-OUT2LIB+=src$/release$/*.lib
-OUT2BIN+=src$/release$/*.dll
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-OUT2LIB+=src$/.libs$/libcairo*.a
-.ELSE
-OUT2LIB+=src$/.libs$/libcairo.so*
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
deleted file mode 100644
index cab9d7d..0000000
--- a/cairo/pixman/makefile.mk
+++ /dev/null
@@ -1,190 +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=cairo
-TARGET=so_pixman
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_CAIRO)" == "YES"
-all:
- @echo "Not building pixman."
-
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-PIXMANVERSION=0.24.4
-
-TARFILE_NAME=pixman-$(PIXMANVERSION)
-TARFILE_MD5=c63f411b3ad147db2bcce1bf262a0e02
-
-ADDITIONAL_FILES=Makefile.win32.common
-
-PATCH_FILES=..$/$(TARFILE_NAME).patch
-
-.IF "$(OS)"=="ANDROID"
-PATCH_FILES+=..$/$(TARFILE_NAME).android.patch
-.ENDIF
-
-# Note: we are building static pixman library to avoid linking problems.
-# However, for Unix dynamic library must be used (especially due to 64bit issues)
-
-.IF "$(OS)"=="WNT"
-# --------- Windows -------------------------------------------------
-.IF "$(COM)"=="GCC"
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(pixman_CFLAGS) -mthreads" LDFLAGS="$(pixman_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" OBJDUMP="$(WRAPCMD) objdump"
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.IF "$(OS)$(COM)"=="WNTGCC"
-.EXPORT : PWD
-.ENDIF
-
-.ELSE # WNT, not GCC
-BUILD_DIR=pixman
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release
-.ENDIF
-
-.ELIF "$(OS)"=="MACOSX"
-# ----------- Mac OS X --------------------------------
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)"
-.IF "$(SYSBASE)"!=""
-.IF "$(EXTRA_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)"
-.ENDIF # "$(EXTRA_CDEFS)"!=""
-.ENDIF # "$(SYSBASE)"!=""
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-
-.ELSE
-# ----------- Unix ---------------------------------------------------------
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
-.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-
-.IF "$(OS)$(COM)"=="SOLARISC52"
-LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
-
-.IF "$(SYSBASE)"!=""
-pixman_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS)
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
-LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl
-.ENDIF
-.ENDIF # "$(SYSBASE)"!=""
-
-.EXPORT: LDFLAGS
-
-.IF "$(COMNAME)"=="sunpro5"
-pixman_CFLAGS+=-xc99=none
-.ENDIF
-
-.IF "$(CPUNAME)"=="INTEL"
-pixman_CFLAGS+=-march=i486
-.ENDIF
-
-pixman_CFLAGS+=-fPIC
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-
-CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
-
-.IF "$(OS)"=="ANDROID"
-
-# The pixman-cpu.c code wants to read /proc/<pid>/auxv, but
-# the Android headers don't define Elf32_auxv_t.
-
-# Maybe we should instead just patch the arm_has_* booleans in
-# pixman-cpu.c to be hardcoded as TRUE and patch out the run-time
-# check?
-
-CONFIGURE_FLAGS+=--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt
-
-.ELIF "$(OS)" == "MACOSX"
-
-CONFIGURE_FLAGS += \
- --prefix=/@.__________________________________________________$(EXTRPATH)
-
-.END
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-
-
-
-# -------- All platforms --------------------------------------------
-
-OUT2INC=pixman$/pixman-version.h \
- pixman$/pixman.h
-
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=pixman$/.libs$/libpixman-1.a
-.ELIF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OUT2LIB+=pixman$/.libs$/*.a
-.ELSE
-OUT2LIB+=pixman$/release$/*.lib
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-OUT2LIB+=pixman$/.libs$/libpixman-1.a
-.ELSE
-OUT2LIB+=pixman$/.libs$/libpixman-1.so*
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
commit 9243d3e23e980a5a58e91d6714e52b80683a46e9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Feb 16 18:23:19 2013 +0100
simplify extension logic in configure
Change-Id: I1b255f9da925501449d7a41ce5914595da582e40
diff --git a/configure.ac b/configure.ac
index cc801f1..11298a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10975,9 +10975,6 @@ AC_SUBST(ENABLE_CORETEXT)
###############################################################################
# Extensions checking
###############################################################################
-dnl ===================================================================
-dnl Test whether to integrate extensions into the product's installer
-dnl ===================================================================
AC_MSG_CHECKING([for extensions integration])
if test "x$enable_extension_integration" != "xno"; then
WITH_EXTENSION_INTEGRATION=YES
@@ -10994,160 +10991,19 @@ dnl There are standalone tests for each of these below.
WITH_EXTRA_EXTENSIONS=
AC_SUBST([WITH_EXTRA_EXTENSIONS])
-dnl ===================================================================
-dnl Test whether to include Watch Window extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Watch Window extension integration])
-WATCH_WINDOW_EXTENSION_PACK=
-if test "x$enable_ext_watch_window" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
- WATCH_WINDOW_EXTENSION_PACK="23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt"
- WITH_EXTRA_EXTENSIONS=YES
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(WATCH_WINDOW_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include SmART Gallery (Diagram) extension
-dnl ===================================================================
-AC_MSG_CHECKING([for SmART Gallery (Diagram) extension integration])
-DIAGRAM_EXTENSION_PACK=
-if test "x$enable_ext_diagram" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
- DIAGRAM_EXTENSION_PACK="8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt"
- WITH_EXTRA_EXTENSIONS=YES
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(DIAGRAM_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Validator extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Validator extension integration])
-VALIDATOR_EXTENSION_PACK=
-if test "x$enable_ext_validator" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_VALIDATOR"
- VALIDATOR_EXTENSION_PACK="bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt"
- WITH_EXTRA_EXTENSIONS=YES
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(VALIDATOR_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Barcode extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Barcode extension integration])
-BARCODE_EXTENSION_PACK=
-if test "x$enable_ext_barcode" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
- BARCODE_EXTENSION_PACK="3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt"
- WITH_EXTRA_EXTENSIONS=YES
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST([BARCODE_EXTENSION_PACK])
-
-dnl ===================================================================
-dnl Test whether to include ConvertTextToNumber extension
-dnl ===================================================================
-AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
-if test "x$enable_ext_ct2n" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- BUILD_TYPE="$BUILD_TYPE CT2N"
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
-dnl ===================================================================
-dnl Test whether to include Numbertext extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Numbertext extension integration])
-NUMBERTEXT_EXTENSION_PACK=
-if test "x$enable_ext_numbertext" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
- NUMBERTEXT_EXTENSION_PACK="b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt"
- WITH_EXTRA_EXTENSIONS=YES
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(NUMBERTEXT_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Hungarian Cross-reference Toolbar extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
-HUNART_EXTENSION_PACK=
-if test "x$enable_ext_hunart" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
- HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
- WITH_EXTRA_EXTENSIONS=YES
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(HUNART_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Typography Toolbar extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Typography Toolbar extension integration])
-TYPO_EXTENSION_PACK=
-if test "x$enable_ext_typo" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
- TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
- WITH_EXTRA_EXTENSIONS=YES
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(TYPO_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Google Docs extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Google Docs extension integration])
-GOOGLE_DOCS_EXTENSION_PACK=
-if test "x$enable_ext_google_docs" = "xyes" -a "x$enable_extension_integration" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
- GOOGLE_DOCS_EXTENSION_PACK="27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt"
- WITH_EXTRA_EXTENSIONS=YES
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(GOOGLE_DOCS_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include NLPSolver extension
-dnl ===================================================================
-AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
- BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
-dnl ===================================================================
-dnl Test whether to include LanguageTool extension
-dnl ===================================================================
-AC_MSG_CHECKING([for LanguageTool extension integration])
-if test "x$enable_ext_languagetool" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
- BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
+libo_CHECK_EXTENSION([Watch Window],[WATCH_WINDOW],[watch_window],[23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt])
+libo_CHECK_EXTENSION([SmART Gallery (Diagram)],[DIAGRAM],[diagram],[8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt])
+libo_CHECK_EXTENSION([Watch Window],[WATCH_WINDOW],[watch_window],[23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt])
+libo_CHECK_EXTENSION([Validator],[VALIDATOR],[validator],[bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt])
+libo_CHECK_EXTENSION([Barcode],[BARCODE],[barcode],[3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt])
+libo_CHECK_EXTENSION([ConvertTextToNumber],[CT2N],[ct2n],[])
+libo_CHECK_EXTENSION([Numbertext],[NUMBERTEXT],[numbertext],[b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt])
+libo_CHECK_EXTENSION([Hungarian Cross-reference Toolbar],[HUNART],[hunart],[b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt])
+libo_CHECK_EXTENSION([Typography Toolbar],[TYPO],[typo],[9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt])
+libo_CHECK_EXTENSION([Google Docs],[GOOGLE_DOCS],[google_docs],[27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt])
+if test "x$with_java" != "xno"; then
+ libo_CHECK_EXTENSION([NLPSolver],[NLPSOLVER],[nlpsolver],[])
+ libo_CHECK_EXTENSION([LanguageTool],[LANGUAGETOOL],[languagetool],[])
fi
dnl ===================================================================
diff --git a/m4/libo_check_extension.m4 b/m4/libo_check_extension.m4
new file mode 100644
index 0000000..9d5a59a
--- /dev/null
+++ b/m4/libo_check_extension.m4
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+AC_DEFUN([libo_CHECK_EXTENSION],[
+AC_MSG_CHECKING([for $1 extension integration])
+$2_EXTENSION_PACK=
+if test "x$enable_ext_$3" = "xyes" -a "x$enable_extension_integration" != "xno"; then
+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_$2"
+ $2_EXTENSION_PACK="$4"
+ BUILD_TYPE="$BUILD_TYPE $2"
+ WITH_EXTRA_EXTENSIONS=YES
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+fi
+AC_SUBST($2_EXTENSION_PACK)
+])
+# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list