diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:47:44 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:47:44 +0200 |
| commit | 941020379b1ea1ec7c564c21e68ea1674cda7683 (patch) | |
| tree | 40fcaf109d6d585bcdc0faf7ea6c0812b3cc9a39 /padmin/Library_spa.mk | |
| parent | 0692507dcc62e94c7af88388961db1d7d12d6dbd (diff) | |
| parent | 0d2916e03ea51529e15995830a1a8c36bd72e442 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
basebmp/prj/d.lst
basebmp/test/basictest.cxx
basebmp/test/makefile.mk
basegfx/inc/basegfx/basegfxdllapi.h
basegfx/inc/basegfx/tools/debugplotter.hxx
basegfx/inc/basegfx/tuple/b2ituple.hxx
basegfx/prj/d.lst
basegfx/source/numeric/makefile.mk
basegfx/source/polygon/makefile.mk
basegfx/source/range/makefile.mk
basegfx/source/raster/makefile.mk
basegfx/source/tuple/makefile.mk
basegfx/source/vector/makefile.mk
basegfx/test/basegfx1d.cxx
basegfx/test/makefile.mk
basegfx/util/makefile.mk
canvas/Library_canvasfactory.mk
canvas/Module_canvas.mk
canvas/prj/build.lst
canvas/prj/d.lst
canvas/source/cairo/cairo_canvashelper_texturefill.cxx
canvas/source/cairo/makefile.mk
canvas/source/tools/makefile.mk
comphelper/qa/string/makefile.mk
cppcanvas/Module_cppcanvas.mk
cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
cppcanvas/prj/build.lst
cppcanvas/prj/d.lst
cppcanvas/source/mtfrenderer/makefile.mk
cppcanvas/util/makefile.mk
i18npool/source/search/makefile.mk
regexp/Library_regexp.mk
regexp/prj/d.lst
sax/CppunitTest_sax.mk
sax/Library_sax.mk
sax/prj/d.lst
sax/qa/cppunit/test_converter.cxx
sax/source/expatwrap/attrlistimpl.hxx
sax/util/makefile.mk
svtools/Library_svt.mk
tools/Executable_sspretty.mk
ucbhelper/prj/d.lst
ucbhelper/source/provider/configureucb.cxx
ucbhelper/source/provider/provconf.cxx
ucbhelper/util/makefile.mk
unotools/Library_utl.mk
unotools/Module_unotools.mk
unotools/Package_inc.mk
unotools/prj/build.lst
vcl/Library_desktop_detector.mk
vcl/Library_vcl.mk
vcl/Library_vclplug_gtk.mk
vcl/aqua/source/gdi/salprn.cxx
vcl/inc/aqua/saldata.hxx
vcl/unx/generic/gdi/salgdi3.cxx
Diffstat (limited to 'padmin/Library_spa.mk')
| -rw-r--r-- | padmin/Library_spa.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 5793f793fead..8d19fe41248f 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,spa)) $(eval $(call gb_Library_set_include,spa,\ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc/stl \ )) $(eval $(call gb_Library_add_defs,spa,\ @@ -45,10 +44,8 @@ $(eval $(call gb_Library_add_linked_libs,spa,\ basegfx \ comphelper \ i18nisolang1 \ - stl \ cppu \ sal \ - vos3 \ $(gb_STDLIBS) \ )) @@ -65,12 +62,17 @@ $(eval $(call gb_Library_add_exception_objects,spa,\ padmin/source/titlectrl \ )) -ifeq ($(OS),LINUX) +ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_linked_libs,spa,\ - dl \ m \ pthread \ )) endif +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,spa,\ + dl \ +)) +endif + # vim: set noet sw=4 ts=4: |