diff options
| -rw-r--r-- | unotools/Library_utl.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_desktop_detector.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_vclplug_kde.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_vclplug_kde4.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_vclplug_svp.mk | 6 | ||||
| -rw-r--r-- | vcl/StaticLibrary_vclmain.mk | 5 |
9 files changed, 44 insertions, 9 deletions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 1a86c469996c..b77a8ebb6826 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,utl,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/unotools/inc/pch) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,utl,\ @@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,utl,\ -DUNOTOOLS_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,utl,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,utl,\ comphelper \ cppu \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index c7e1cd087d4e..7a34ee739461 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,desktop_detector,\ -I$(realpath $(SRCDIR)/vcl/inc) \ -I$(realpath $(SRCDIR)/vcl/inc/pch) \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,desktop_detector,\ -DDESKTOP_DETECTOR_IMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,desktop_detector,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,desktop_detector,\ vcl \ tl \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d663d462d972..c8292cf7ac71 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_set_include,vcl,\ -I$(realpath $(SRCDIR)/vcl/inc) \ -I$(realpath $(SRCDIR)/vcl/inc/pch) \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \ )) @@ -61,6 +60,11 @@ $(eval $(call gb_Library_set_defs,vcl,\ -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \ )) +$(eval $(call gb_Library_add_api,vcl,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,vcl,\ tl \ utl \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 494f36acc349..b5cca31d365f 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -32,10 +32,14 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/inc/pch \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_Library_add_api,vclplug_gen,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ vcl \ tl \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 838df57d1d8e..da001a220565 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/inc/pch \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -62,6 +61,11 @@ $(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ )) endif +$(eval $(call gb_Library_add_api,vclplug_gtk,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ $$(LDFLAGS) \ $$(GTK_LIBS) \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index efb134d912ac..bcec46732b7d 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/inc/pch \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -46,6 +45,11 @@ $(eval $(call gb_Library_set_defs,vclplug_kde,\ -DVCLPLUG_KDE_IMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,vclplug_kde,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_set_ldflags,vclplug_kde,\ $$(KDE_LIBS)\ $$(LDFLAGS) \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 0f7f3e78696b..c075ca3ba4e1 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/inc/pch \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ -I$(WORKDIR)/CustomTarget/vcl/unx/kde4 \ )) @@ -49,6 +48,11 @@ $(eval $(call gb_Library_set_defs,vclplug_kde4,\ -DVCLPLUG_KDE4_IMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,vclplug_kde4,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_set_ldflags,vclplug_kde4,\ $$(KDE4_LIBS)\ $$(LDFLAGS) \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 5ba89f3568db..8c222ad05b9b 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/inc/pch \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,vclplug_svp,\ -DVCLPLUG_SVP_IMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,vclplug_svp,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ vcl \ vclplug_gen \ diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index 044ce10ca40c..1b6496ce2623 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -32,10 +32,13 @@ $(eval $(call gb_StaticLibrary_set_include,vclmain,\ -I$(realpath $(SRCDIR)/vcl/inc) \ -I$(realpath $(SRCDIR)/vcl/inc/pch) \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_StaticLibrary_add_api,vclmain,\ + udkapi \ +)) + $(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\ vcl/source/salmain/salmain \ )) |