shell/Library_ooofilt.mk | 23 ++++++--------------
shell/Library_ooofilt_x64.mk | 10 +++-----
shell/Library_propertyhdl.mk | 19 +++++-----------
shell/Library_propertyhdl_x64.mk | 5 ++++
shell/Library_shlxthdl.mk | 10 +++-----
shell/Library_shlxthdl_x64.mk | 10 +++-----
shell/Module_shell.mk | 4 +--
shell/source/cmdmail/exports.dxp | 1
shell/source/win32/exports.dxp | 1
shell/source/win32/shlxthandler/prophdl/exports.dxp | 2 -
shell/source/win32/simplemail/exports.dxp | 1
11 files changed, 33 insertions(+), 53 deletions(-)
New commits:
commit 3ca7b8c296bcda699bcf642db3932b3fdbe7ad06
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon May 28 15:04:18 2012 +0200
shell: export more symbols, as private
Change-Id: Ifca9712c2ee28c8e38925150b3e6d0f27195ff1d
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 30dd615..35e3662 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -57,38 +57,31 @@ $(eval $(call gb_Library_use_libraries,ooofilt,\
advapi32 \
comctl32 \
kernel32 \
+ msvcprt \
ole32 \
shell32 \
uuid \
$(gb_Library_win32_OLDNAMES) \
))
-ifneq ($(COM),GCC)
-
-$(eval $(call gb_Library_use_libraries,ooofilt,\
- msvcprt \
-))
-
ifneq ($(PRODUCT),full)
$(eval $(call gb_Library_use_libraries,ooofilt,\
msvcrt \
))
endif
-$(eval $(call gb_Library_add_ldflags,ooofilt,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
-))
-
-endif
-
$(eval $(call gb_Library_use_static_libraries,ooofilt,\
shell_xmlparser \
shlxthandler_common \
))
+$(eval $(call gb_Library_add_ldflags,ooofilt,\
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllRegisterServer,PRIVATE \
+ /EXPORT:DllUnregisterServer,PRIVATE \
+))
+
$(eval $(call gb_Library_add_exception_objects,ooofilt,\
shell/source/win32/shlxthandler/ooofilt/ooofilt \
shell/source/win32/shlxthandler/ooofilt/propspec \
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 0e68d62..ca779ff 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -77,14 +77,12 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
shlxthandler_common_x64 \
))
-ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllRegisterServer,PRIVATE \
+ /EXPORT:DllUnregisterServer,PRIVATE \
))
-endif
$(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\
CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 250a530..8b7d7ff 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,propertyhdl,\
gdi32 \
gdiplus \
kernel32 \
+ msvcprt \
ole32 \
oleaut32 \
propsys \
@@ -67,24 +68,16 @@ $(eval $(call gb_Library_use_libraries,propertyhdl,\
uuid \
))
-ifneq ($(COM),GCC)
-
-$(eval $(call gb_Library_use_libraries,propertyhdl,\
- msvcprt \
-))
-
-ifneq ($(PRODUCT),full)
-$(eval $(call gb_Library_use_libraries,propertyhdl,\
-))
-endif
-
-endif
-
$(eval $(call gb_Library_use_static_libraries,propertyhdl,\
shell_xmlparser \
shlxthandler_common \
))
+$(eval $(call gb_Library_add_ldflags,propertyhdl,\
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+))
+
$(eval $(call gb_Library_add_exception_objects,propertyhdl,\
shell/source/win32/shlxthandler/prophdl/propertyhdl \
))
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index af9fa22..c84738b 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -78,6 +78,11 @@ $(eval $(call
gb_Library_use_static_libraries,propertyhdl_x64,\
shlxthandler_common_x64 \
))
+$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+))
+
$(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\
shell/source/win32/shlxthandler/prophdl/propertyhdl \
))
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 199cc8d..c546db6 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -73,14 +73,12 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\
$(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl))
-ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,shlxthdl,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllRegisterServer,PRIVATE \
+ /EXPORT:DllUnregisterServer,PRIVATE \
))
-endif
$(eval $(call gb_Library_add_exception_objects,shlxthdl,\
shell/source/win32/shlxthandler/classfactory \
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index 5411162..d1e2d98 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -79,14 +79,12 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl))
-ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllRegisterServer,PRIVATE \
+ /EXPORT:DllUnregisterServer,PRIVATE \
))
-endif
$(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\
CustomTarget/shell/source/win32/shlxthandler/classfactory \
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 6e3c242..124ed70 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Module_add_targets,shell,\
))
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,shell,\
Executable_regsvrex \
@@ -77,7 +77,7 @@ $(eval $(call gb_Module_add_targets,shell,\
StaticLibrary_simplemapi \
))
-ifneq ($(COM),GCC)
+ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,shell,\
CustomTarget_shlxthdl_res \
Library_ooofilt \
diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/shell/source/cmdmail/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/shell/source/win32/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/shell/source/win32/shlxthandler/prophdl/exports.dxp
b/shell/source/win32/shlxthandler/prophdl/exports.dxp
deleted file mode 100755
index 2ada825..0000000
--- a/shell/source/win32/shlxthandler/prophdl/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-DllGetClassObject PRIVATE
-DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/shell/source/win32/simplemail/exports.dxp
b/shell/source/win32/simplemail/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/shell/source/win32/simplemail/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
