diff options
| author | David Tardon <dtardon@redhat.com> | 2011-05-30 18:47:55 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-06-17 14:43:29 +0200 |
| commit | 2ef73ac0e45adb283a6cff2645bddd53aa6b3d70 (patch) | |
| tree | 9b3d1027c5a20f48f5783e4bf1d523ba166e02f2 /slideshow | |
| parent | 6813470ad0f8ed4a87ed296d8d35e6857f10bf15 (diff) | |
remove all traces of offuh from makefiles
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/CppunitTest_slideshow.mk | 6 | ||||
| -rw-r--r-- | slideshow/Executable_demoshow.mk | 6 | ||||
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 6 | ||||
| -rw-r--r-- | slideshow/Library_slideshow.mk | 6 |
4 files changed, 20 insertions, 4 deletions
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 3105f9091eed..39675246d319 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_set_include,slideshow,\ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ -I$(realpath $(SRCDIR)/slideshow/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_CppunitTest_set_defs,slideshow,\ @@ -49,6 +48,11 @@ $(eval $(call gb_CppunitTest_set_defs,slideshow,\ )) endif +$(eval $(call gb_CppunitTest_add_api,slideshow,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_CppunitTest_add_library_objects,slideshow,slideshow)) $(eval $(call gb_CppunitTest_add_linked_libs,slideshow,\ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 6c54ff5bad01..a50d79aae30b 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Executable_set_include,demoshow,\ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ -I$(realpath $(SRCDIR)/slideshow/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) ifeq ($(strip $(VERBOSE)),TRUE) @@ -51,6 +50,11 @@ $(eval $(call gb_Executable_set_defs,demoshow,\ )) endif +$(eval $(call gb_Library_add_api,demoshow,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Executable_add_linked_libs,demoshow,\ basegfx \ comphelper \ diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 3a04c1e4fcce..eb34b01c4199 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,OGLTrans,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) ifeq ($(strip $(VERBOSE)),TRUE) @@ -50,6 +49,11 @@ $(eval $(call gb_Library_set_defs,OGLTrans,\ )) endif +$(eval $(call gb_Library_add_api,OGLTrans,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,OGLTrans,\ canvastools \ comphelper \ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 3823474b2976..d5a1458bd3cd 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,slideshow,\ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ -I$(realpath $(SRCDIR)/slideshow/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,slideshow,\ @@ -50,6 +49,11 @@ $(eval $(call gb_Library_set_defs,slideshow,\ )) endif +$(eval $(call gb_Library_add_api,slideshow,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,slideshow,\ avmedia \ basegfx \ |