mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

postmerge fixes for gnumake4

Browse Source
This commit is contained in:
Bjoern Michaelsen
2011-07-22 21:07:24 +02:00
parent a233dac065
commit c81f9104b6
24 changed files with 97 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
basegfx/CppunitTest_basegfx.mk
View File

@@ -53,4 +53,9 @@ $(eval $(call gb_CppunitTest_set_include,basegfx_test,\
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_CppunitTest_add_api,basegfx_test,\
offapi \
udkapi \
))
# vim: set noet sw=4 ts=4:

16
basegfx/Library_basegfx.mk
View File

@@ -36,13 +36,17 @@ $(eval $(call gb_Library_set_include,basegfx,\
-I$(SRCDIR)/basegfx/source/inc \
-I$(SRCDIR)/basegfx/inc/pch \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,basegfx,\
-DBASEGFX_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_add_api,basegfx,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,basegfx,\
cppu \
cppuhelper \
@@ -51,14 +55,15 @@ $(eval $(call gb_Library_add_linked_libs,basegfx,\
))
$(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/tools/liangbarsky \
basegfx/source/tools/debugplotter \
basegfx/source/tools/b2dclipstate \
basegfx/source/tools/canvastools \
basegfx/source/tools/debugplotter \
basegfx/source/tools/gradienttools \
basegfx/source/tools/keystoplerp \
basegfx/source/tools/unopolypolygon \
basegfx/source/tools/liangbarsky \
basegfx/source/tools/tools \
basegfx/source/tools/b2dclipstate \
basegfx/source/tools/unopolypolygon \
basegfx/source/tools/unotools \
basegfx/source/numeric/ftools \
basegfx/source/tuple/b3ituple \
basegfx/source/tuple/b3dtuple \
@@ -98,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/matrix/b3dhommatrix \
basegfx/source/matrix/b2dhommatrix \
basegfx/source/point/b3ipoint \
basegfx/source/point/b3dhompoint \
basegfx/source/point/b2dpoint \
basegfx/source/point/b3dpoint \
basegfx/source/point/b2dhompoint \

1
basegfx/Package_inc.mk
View File

@@ -92,7 +92,6 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/pixel/bpixel.hxx,baseg
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrix.hxx,basegfx/matrix/b2dhommatrix.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b3dhommatrix.hxx,basegfx/matrix/b3dhommatrix.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrixtools.hxx,basegfx/matrix/b2dhommatrixtools.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dhompoint.hxx,basegfx/point/b3dhompoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3ipoint.hxx,basegfx/point/b3ipoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dpoint.hxx,basegfx/point/b3dpoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dpoint.hxx,basegfx/point/b2dpoint.hxx))

8
basegfx/StaticLibrary_basegfx_s.mk
View File

@@ -36,7 +36,12 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
-I$(SRCDIR)/basegfx/source/inc \
$$(INCLUDE) \
-I$(SRCDIR)/basegfx/inc/pch \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
$(eval $(call gb_StaticLibrary_add_api,basegfx_s,\
offapi \
udkapi \
))
# the whole library is a hack
@@ -103,7 +108,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
CustomTarget/basegfx/source/matrix/b3dhommatrix \
CustomTarget/basegfx/source/matrix/b2dhommatrix \
CustomTarget/basegfx/source/point/b3ipoint \
CustomTarget/basegfx/source/point/b3dhompoint \
CustomTarget/basegfx/source/point/b2dpoint \
CustomTarget/basegfx/source/point/b3dpoint \
CustomTarget/basegfx/source/point/b2dhompoint \

4
basegfx/inc/basegfx/tools/unotools.hxx
View File

@@ -44,10 +44,10 @@ class B2DPolyPolygon;
namespace unotools
{
B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const ::com::sun::star::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
BASEGFX_DLLPUBLIC B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const ::com::sun::star::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
throw( ::com::sun::star::lang::IllegalArgumentException );
void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
BASEGFX_DLLPUBLIC void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
::com::sun::star::drawing::PolyPolygonBezierCoords& rRetval );
}
}

2
basegfx/prj/build.lst
View File

@@ -1,3 +1,3 @@
fx basegfx : o3tl sal offapi comphelper cppuhelper cppu CPPUNIT:cppunit NULL
fx basegfx : o3tl sal offapi udkapi comphelper cppuhelper cppu CPPUNIT:cppunit NULL
fx basegfx\prj nmake - all fx_prj NULL

1
canvas/Library_cairocanvas.mk
View File

@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)

5
canvas/Library_canvasfactory.mk
View File

@@ -33,9 +33,12 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_api,canvasfactory,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
cppu \
cppuhelper \

6
canvas/Library_canvastools.mk
View File

@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,canvastools,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_api,canvastools,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_defs,canvastools,\

5
canvas/Library_directx5canvas.mk
View File

@@ -34,9 +34,12 @@ $(eval $(call gb_Library_set_include,directx5canvas,\
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(SRCDIR)/canvas/source/directx \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_api,directx5canvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_defs,directx5canvas,\
-DDIRECTX_VERSION=0x0500 \
))

1
canvas/Library_directx9canvas.mk
View File

@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,directx9canvas,\

6
canvas/Library_gdipluscanvas.mk
View File

@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_api,gdipluscanvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_defs,gdipluscanvas,\

6
canvas/Library_nullcanvas.mk
View File

@@ -31,7 +31,11 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_api,nullcanvas,\
offapi \
udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)

6
canvas/Library_simplecanvas.mk
View File

@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_api,simplecanvas,\
offapi \
udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)

6
canvas/Library_vclcanvas.mk
View File

@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_api,vclcanvas,\
offapi \
udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)

5
cppcanvas/Library_cppcanvas.mk
View File

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_set_include,cppcanvas,\
-I$(SRCDIR)/cppcanvas/inc/pch \
-I$(SRCDIR)/cppcanvas/source/inc \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_api,cppcanvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_defs,cppcanvas,\
-DCPPCANVAS_DLLIMPLEMENTATION \
))

6
regexp/Library_regexp.mk
View File

@@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,i18nregexp))
$(eval $(call gb_Library_add_package_headers,i18nregexp,regexp_inc))
$(eval $(call gb_Library_set_include,i18nregexp,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
$(eval $(call gb_Library_add_api,i18nregexp,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_defs,i18nregexp,\

7
sax/CppunitTest_sax.mk
View File

@@ -38,9 +38,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \
$(gb_STDLIBS) \
))
$(eval $(call gb_CppunitTest_set_include,sax_cppunit,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
$(eval $(call gb_CppunitTest_add_api,sax_cppunit,\
offapi \
udkapi \
))
# vim: set noet sw=4 ts=4:

6
sax/Library_expwrap.mk
View File

@@ -31,10 +31,14 @@ $(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap)
$(eval $(call gb_Library_set_include,expwrap,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
$(eval $(call gb_Library_add_api,expwrap,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,expwrap,\
cppu \
cppuhelper \

6
sax/Library_fastsax.mk
View File

@@ -31,10 +31,14 @@ $(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax
$(eval $(call gb_Library_set_include,fastsax,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
$(eval $(call gb_Library_add_api,fastsax,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,fastsax,\
cppu \
cppuhelper \

6
sax/Library_sax.mk
View File

@@ -33,10 +33,14 @@ $(eval $(call gb_Library_add_package_headers,sax,\
$(eval $(call gb_Library_set_include,sax,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
$(eval $(call gb_Library_add_api,sax,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_defs,sax,\
-DSAX_DLLIMPLEMENTATION \
))

6
ucbhelper/Library_ucbhelper.mk
View File

@@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,ucbhelper,\
$$(INCLUDE) \
-I$(SRCDIR)/ucbhelper/inc \
-I$(SRCDIR)/ucbhelper/inc/pch \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,ucbhelper,\
-DUCBHELPER_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_add_api,ucbhelper,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,ucbhelper,\
cppu \
cppuhelper \

20
vcl/Library_vcl.mk
View File

@@ -56,8 +56,7 @@ $(eval $(call gb_Library_set_include,vcl,\
-I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
))
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
$(eval $(call gb_Library_add_cxxflags,vcl,\
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
@@ -200,8 +199,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
endif
ifeq ($(GUIBASE),android)
$(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \
$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
@@ -473,8 +471,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/components/rasterizer_rsvg \
))
$(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \
$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_LIBRSVG \
))
ifeq ($(SYSTEM_CAIRO),YES)
@@ -490,8 +487,7 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\
# that point as they occur on the command line, it is pointless to
# search the cairo library at that point as no references to cairo
# entries have been read from object files yet.
$(eval $(call gb_Library_set_ldflags,vcl,\
$$(LDFLAGS) \
$(eval $(call gb_Library_add_ldflags,vcl,\
$$(CAIRO_LIBS) \
))
@@ -515,8 +511,7 @@ endif
endif
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_set_ldflags,vcl,\
$$(LDFLAGS) \
$(eval $(call gb_Library_add_ldflags,vcl,\
$$(FONTCONFIG_LIBS) \
$$(FREETYPE_LIBS) \
))
@@ -561,7 +556,7 @@ $(eval $(call gb_Library_add_ldflags,vcl,\
))
endif
ifeq ($(COM),GCC)
$(eval $(call gb_Library_set_ldflags,vcl,\
$(eval $(call gb_Library_add_ldflags,vcl,\
$$(LDFLAGS) \
))
endif
@@ -585,8 +580,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
endif
ifeq ($(GUIBASE),cocoatouch)
$(eval $(call gb_Library_set_ldflags,vcl,\
$$(LDFLAGS) \
$(eval $(call gb_Library_add_ldflags,vcl,\
-framework UIKit \
-framework CoreFoundation \
))

6
vcl/Library_vclplug_gen.mk
View File

@@ -67,17 +67,17 @@ $(call gb_Library_use_externals,vclplug_gen,\
icuuc \
)
))
ifeq ($(SYSTEM_CAIRO),YES)
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
$$(LDFLAGS) \
$$(CAIRO_LIBS) \
))
else
$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
$$(CXXFLAGS) \
$(eval $(call gb_Library_add_cxxflags,vclplug_gen,\
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
cairo \
))