fix link order

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf638d6..739769e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,16 +163,6 @@ INSTALL( FILES ${CMAKE_BINARY_DIR}/libzypp.pc DESTINATION ${LIB_INSTALL_DIR}/pkg
 MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules")
 INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
 
-MACRO(add_subdir_sources subdir real_sources)
-  MESSAGE( STATUS "Adding ${subdir} to sources..." )
-  SET(sources)
-  INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/CMakeLists.txt")
-  FOREACH(src ${sources})
-    MESSAGE( STATUS "  - ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/${src}" )
-    SET(real_sources ${real_sources} "${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/${src}")
-  ENDFOREACH(src)
-ENDMACRO(add_subdir_sources)
-
 ####################################################################
 # SUBDIRECTORIES                                                   #
 ####################################################################

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 5ac76b5..84e7bdc 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -185,13 +185,13 @@ SET( zypp_base_SRCS
   base/GzStream.cc
   base/IOStream.cc
   base/InputStream.cc
-  base/LogControl.cc
   base/Measure.cc
   base/ProfilingFormater.cc
   base/ReferenceCounted.cc
   base/String.cc
   base/Sysconfig.cc
   base/Unit.cc
+  base/LogControl.cc
 )
 
 SET( zypp_base_HEADERS
@@ -957,12 +957,9 @@ ${zypp_capability_SRCS}
 ${zypp_ui_SRCS}
 ${zypp_parser_xmlstore_SRCS}
 ${zypp_data_SRCS}
-${zypp_media_SRCS}
 ${zypp_target_hal_SRCS}
 ${zypp_parser_xml_SRCS}
-${zypp_media_proxyinfo_SRCS}
 ${zypp_source_yum_SRCS}
-${zypp_base_SRCS}
 ${zypp_solver_detail_SRCS}
 ${zypp_target_store_SRCS}
 ${zypp_url_SRCS}
@@ -978,6 +975,9 @@ ${zypp_parser_yum_SRCS}
 ${zypp_parser_inifile_SRCS}
 ${zypp_detail_SRCS}
 ${zypp_pool_SRCS}
+${zypp_media_SRCS}
+${zypp_media_proxyinfo_SRCS}
+${zypp_base_SRCS}
 )
 
 SET( zypp_lib_HEADERS