Export elf metadata extraction methods and header
Properly embed versioning information into major libraries

diff --git a/tdeio/tdeio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt
index e2b96eb..5f04568 100644
--- a/tdeio/tdeio/CMakeLists.txt
+++ b/tdeio/tdeio/CMakeLists.txt
@@ -61,7 +61,7 @@
     tcpslavebase.h forwardingslavebase.h observer.h
     chmodjob.h kmdbase.h authinfo.h ioslave_defaults.h
     http_slave_defaults.h previewjob.h thumbcreator.h
-    metainfojob.h davjob.h renamedlg.h skipdlg.h
+    metainfojob.h davjob.h renamedlg.h skipdlg.h tdelficon.h
     ${CMAKE_CURRENT_BINARY_DIR}/uiserver_stub.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
diff --git a/tdeio/tdeio/tdelficon.h b/tdeio/tdeio/tdelficon.h
index 37b629f..fc3b1be 100644
--- a/tdeio/tdeio/tdelficon.h
+++ b/tdeio/tdeio/tdelficon.h
@@ -1,3 +1,5 @@
+#include <tdelibs_export.h>
+
 #include <alloca.h>
 #include <stdint.h>
 #include <cstdlib>
@@ -49,6 +51,6 @@
   // END HACK
 }
 
-int get_iconlist(libr_file *file_handle, iconlist *icons);
-iconentry *get_nexticon(iconlist *icons, iconentry *last_entry);
-TQString elf_get_resource(libr_file *handle, char *section_name);
+TDEIO_EXPORT int get_iconlist(libr_file *file_handle, iconlist *icons);
+TDEIO_EXPORT iconentry *get_nexticon(iconlist *icons, iconentry *last_entry);
+TDEIO_EXPORT TQString elf_get_resource(libr_file *handle, char *section_name);
diff --git a/tdelfeditor/CMakeLists.txt b/tdelfeditor/CMakeLists.txt
index ebc99ab..46e6215 100644
--- a/tdelfeditor/CMakeLists.txt
+++ b/tdelfeditor/CMakeLists.txt
@@ -44,11 +44,12 @@
 endif( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmrevision" )
 
 tde_curdatetime( _datetime )
-set( ELF_EMBEDDING_METADATA "\"\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
-separate_arguments( ELF_EMBEDDING_METADATA )
 
 if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
   if( NOT "${TDE_SCM_MODULE_REVISION}" STREQUAL "" )
+    get_target_property( _version DCOP-shared VERSION )
+    set( ELF_EMBEDDING_METADATA "\"DCOP-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
+    separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
       # embed name and metadata
       update_libDCOP_metadata ALL
@@ -59,6 +60,9 @@
       COMMENT "Storing SCM metadata in dcop/libDCOP.so"
     )
 
+    get_target_property( _version tdecore-shared VERSION )
+    set( ELF_EMBEDDING_METADATA "\"tdecore-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
+    separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
       # embed name and metadata
       update_libtdecore_metadata ALL
@@ -69,6 +73,9 @@
       COMMENT "Storing SCM metadata in tdecore/libtdecore.so"
     )
 
+    get_target_property( _version tdeio-shared VERSION )
+    set( ELF_EMBEDDING_METADATA "\"tdeio-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
+    separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
       # embed name and metadata
       update_libtdeio_metadata ALL
@@ -79,6 +86,9 @@
       COMMENT "Storing SCM metadata in tdeui/libtdeio.so"
     )
 
+    get_target_property( _version tdeui-shared VERSION )
+    set( ELF_EMBEDDING_METADATA "\"tdeui-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
+    separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
       # embed name and metadata
       update_libtdeui_metadata ALL
@@ -89,6 +99,9 @@
       COMMENT "Storing SCM metadata in tdeui/libtdeui.so"
     )
 
+    get_target_property( _version tdeutils-shared VERSION )
+    set( ELF_EMBEDDING_METADATA "\"tdeutils-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
+    separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
       # embed name and metadata
       update_libtdeutils_metadata ALL
@@ -99,6 +112,9 @@
       COMMENT "Storing SCM metadata in tdeutils/libtdeutils.so"
     )
 
+    get_target_property( _version tdeprint-shared VERSION )
+    set( ELF_EMBEDDING_METADATA "\"tdeprint-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
+    separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
       # embed name and metadata
       update_libtdeprint_metadata ALL
@@ -109,6 +125,9 @@
       COMMENT "Storing SCM metadata in tdeprint/libtdeprint.so"
     )
 
+    get_target_property( _version tdehtml-shared VERSION )
+    set( ELF_EMBEDDING_METADATA "\"tdehtml-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
+    separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
       # embed name and metadata
       update_libtdehtml_metadata ALL
@@ -118,5 +137,5 @@
       DEPENDS tdehtml-shared
       COMMENT "Storing SCM metadata in tdehtml/libtdehtml.so"
     )
-  endif( NOT "${TDE_SCM_MODULE_REVISION}" STREQUAL "" )
-endif( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
\ No newline at end of file
+  endif( )
+endif( )
\ No newline at end of file

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

diff --git a/cmake b/cmake
index 5e4b437..f405562 160000
--- a/cmake
+++ b/cmake
-Subproject commit 5e4b4371800526bccacadd1bcc478410b59a7a69
+Subproject commit f4055629928cc70c5d29f9e8c4386441b7717a16