Kaydet (Commit) 68e8a840 authored tarafından David Tardon's avatar David Tardon

remove all traces of offuh from makefiles

üst 2a0a1036
...@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,drawinglayer,\ ...@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,drawinglayer,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(realpath $(SRCDIR)/drawinglayer/inc/pch) \ -I$(realpath $(SRCDIR)/drawinglayer/inc/pch) \
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
-I$(OUTDIR)/inc/offuh \
)) ))
$(eval $(call gb_Library_set_defs,drawinglayer,\ $(eval $(call gb_Library_set_defs,drawinglayer,\
...@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,drawinglayer,\ ...@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,drawinglayer,\
-DDRAWINGLAYER_DLLIMPLEMENTATION \ -DDRAWINGLAYER_DLLIMPLEMENTATION \
)) ))
$(eval $(call gb_Library_add_api,drawinglayer,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,drawinglayer,\ $(eval $(call gb_Library_add_linked_libs,drawinglayer,\
avmedia \ avmedia \
basegfx \ basegfx \
......
...@@ -57,8 +57,12 @@ $(eval $(call gb_CppunitTest_add_linked_libs,editeng_borderline, \ ...@@ -57,8 +57,12 @@ $(eval $(call gb_CppunitTest_add_linked_libs,editeng_borderline, \
$(eval $(call gb_CppunitTest_set_include,editeng_borderline,\ $(eval $(call gb_CppunitTest_set_include,editeng_borderline,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
)) ))
$(eval $(call gb_CppunitTest_add_api,editeng_borderline,\
offapi \
udkapi \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -30,10 +30,14 @@ $(eval $(call gb_Library_Library,fileacc)) ...@@ -30,10 +30,14 @@ $(eval $(call gb_Library_Library,fileacc))
$(eval $(call gb_Library_set_include,fileacc,\ $(eval $(call gb_Library_set_include,fileacc,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
)) ))
$(eval $(call gb_Library_add_api,fileacc,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,fileacc,\ $(eval $(call gb_Library_add_linked_libs,fileacc,\
cppu \ cppu \
cppuhelper \ cppuhelper \
......
...@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,for,\ ...@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,for,\
-I$(realpath $(SRCDIR)/formula/inc/pch) \ -I$(realpath $(SRCDIR)/formula/inc/pch) \
-I$(realpath $(SRCDIR)/formula/source/core/inc) \ -I$(realpath $(SRCDIR)/formula/source/core/inc) \
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
-I$(OUTDIR)/inc/offuh \
)) ))
$(eval $(call gb_Library_set_defs,for,\ $(eval $(call gb_Library_set_defs,for,\
...@@ -46,6 +45,11 @@ $(eval $(call gb_Library_set_defs,for,\ ...@@ -46,6 +45,11 @@ $(eval $(call gb_Library_set_defs,for,\
-DFORMULA_DLLIMPLEMENTATION \ -DFORMULA_DLLIMPLEMENTATION \
)) ))
$(eval $(call gb_Library_add_api,for,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,for,\ $(eval $(call gb_Library_add_linked_libs,for,\
comphelper \ comphelper \
cppu \ cppu \
......
...@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,forui,\ ...@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,forui,\
-I$(realpath $(SRCDIR)/formula/inc/pch) \ -I$(realpath $(SRCDIR)/formula/inc/pch) \
-I$(realpath $(SRCDIR)/formula/source/ui/inc) \ -I$(realpath $(SRCDIR)/formula/source/ui/inc) \
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
-I$(OUTDIR)/inc/offuh \
)) ))
$(eval $(call gb_Library_set_defs,forui,\ $(eval $(call gb_Library_set_defs,forui,\
...@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,forui,\ ...@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,forui,\
-DFORMULA_DLLIMPLEMENTATION \ -DFORMULA_DLLIMPLEMENTATION \
)) ))
$(eval $(call gb_Library_add_api,forui,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_linked_libs,forui,\ $(eval $(call gb_Library_add_linked_libs,forui,\
cppu \ cppu \
cppuhelper \ cppuhelper \
......
...@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar)) ...@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar))
$(eval $(call gb_Library_set_include,lomenubar,\ $(eval $(call gb_Library_set_include,lomenubar,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
$(shell pkg-config --cflags-only-I dbusmenu-gtk-0.4) \ $(shell pkg-config --cflags-only-I dbusmenu-gtk-0.4) \
)) ))
$(eval $(call gb_Library_add_api,lomenubar,\
offapi \
udkapi \
))
$(eval $(call gb_Library_set_ldflags,lomenubar,\ $(eval $(call gb_Library_set_ldflags,lomenubar,\
$$(LDFLAGS) \ $$(LDFLAGS) \
$(shell pkg-config --libs dbusmenu-gtk-0.4) \ $(shell pkg-config --libs dbusmenu-gtk-0.4) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment