From aa657051f849f4e9eb4f4138f2f6089e7ddfc63a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 30 May 2011 18:47:52 +0200 Subject: remove all traces of offuh from makefiles --- cui/Library_cui.mk | 6 +++++- forms/Library_frm.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 6e3bf195b58a..556765018568 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,cui,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/cui/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,cui,\ @@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,cui,\ $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \ )) +$(eval $(call gb_Library_add_api,cui,\ + offapi \ + udkapi \ +)) + # .IF "$(ENABLE_LAYOUT)" == "TRUE" # CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc # .ENDIF # ENABLE_LAYOUT == TRUE diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 1208fa5c5d0c..72d064221fa3 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,frm,\ -I$(realpath $(SRCDIR)/forms/source/inc) \ -I$(realpath $(SRCDIR)/forms/source/solar/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \ )) @@ -44,6 +43,11 @@ $(eval $(call gb_Library_set_defs,frm,\ $(if $(filter YES,$(SYSTEM_LIBXML)),-DSYSTEM_LIBXML $(filter-out -I%,$(LIBXML_CFLAGS))) \ )) +$(eval $(call gb_Library_add_api,frm,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,frm,\ comphelper \ cppu \ -- cgit