From b2ca6f871fb8cc355880594d1efa887d4028a5ea Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Mon, 17 Jul 2006 13:37:30 +0000 Subject: [PATCH] build --- configure.ac | 2 +- testsuite/cache/SourceCacheInitializer.cc | 4 ++-- zypp2/Makefile.am | 9 +++++---- zypp2/cache/KnownSourcesCache.cpp | 4 ++-- zypp2/cache/KnownSourcesCache.h | 2 +- zypp2/cache/SourceCache.cpp | 6 +++--- zypp2/cache/SourceCache.h | 2 +- zypp2/cache/SourceCacheInitializer.cpp | 4 ++-- zypp2/cache/SourceCacheInitializer.h | 2 +- zypp2/cache/SourceCacher.cpp | 2 +- zypp2/cache/Utils.cpp | 2 +- zypp2/dummy.cc | 0 zypp2/source/Makefile.am | 4 ++-- zypp2/source/dummy.cc | 0 zypp2/source/yum/YUMSourceCacher.cc | 4 ++-- zypp2/source/yum/YUMSourceCacher.h | 2 +- 16 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 zypp2/dummy.cc create mode 100644 zypp2/source/dummy.cc diff --git a/configure.ac b/configure.ac index bbe93a7..a00cb2c 100644 --- a/configure.ac +++ b/configure.ac @@ -225,7 +225,6 @@ AC_OUTPUT( po/Makefile.in\ testsuite/src/utils/Makefile \ testsuite/zypp/Makefile \ testsuite/cache/Makefile \ - testsuite/zypp/tests/Makefile \ testsuite/solver/Makefile \ testsuite/solver/src/Makefile \ testsuite/src/helix/Makefile \ @@ -254,6 +253,7 @@ AC_OUTPUT( po/Makefile.in\ zypp/solver/Makefile \ zypp/solver/detail/Makefile \ zypp/data/Makefile \ + zypp2/Makefile \ zypp2/cache/Makefile \ zypp2/cache/sqlite3x/Makefile zypp2/source/Makefile \ diff --git a/testsuite/cache/SourceCacheInitializer.cc b/testsuite/cache/SourceCacheInitializer.cc index 1eb52b4..ace7fca 100644 --- a/testsuite/cache/SourceCacheInitializer.cc +++ b/testsuite/cache/SourceCacheInitializer.cc @@ -6,13 +6,13 @@ #include "zypp/base/Logger.h" #include "zypp/Arch.h" #include "zypp/TmpPath.h" -#include "zypp/cache/SourceCacheInitializer.h" +#include "zypp2/cache/SourceCacheInitializer.h" // Boost.Test #include #include -#include "zypp/cache/sqlite3x/sqlite3x.hpp" +#include "zypp2/cache/sqlite3x/sqlite3x.hpp" using boost::unit_test::test_suite; using boost::unit_test::test_case; diff --git a/zypp2/Makefile.am b/zypp2/Makefile.am index 6d499a6..7a19baf 100644 --- a/zypp2/Makefile.am +++ b/zypp2/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in ## ################################################## -SUBDIRS = cache +SUBDIRS = cache source AM_CXXFLAGS = -DZYPP_BASE_LOGGER_LOGGROUP=\"zypp2\" @@ -15,11 +15,12 @@ lib_LTLIBRARIES = lib@PACKAGE@2.la ## ################################################## -lib@PACKAGE@2_la_SOURCES = +lib@PACKAGE@2_la_SOURCES = dummy.cc -lib@PACKAGE@_la_LDFLAGS = @LIBZYPP_VERSION_INFO@ +lib@PACKAGE@2_la_LDFLAGS = @LIBZYPP_VERSION_INFO@ -lib@PACKAGE@_la_LIBADD = cache/lib@PACKAGE@2_cache.la \ +lib@PACKAGE@2_la_LIBADD = cache/lib@PACKAGE@2_cache.la \ + source/lib@PACKAGE@2_source.la \ -lboost_filesystem \ -lsqlite3 \ -lutil diff --git a/zypp2/cache/KnownSourcesCache.cpp b/zypp2/cache/KnownSourcesCache.cpp index 6abc1ce..861221c 100644 --- a/zypp2/cache/KnownSourcesCache.cpp +++ b/zypp2/cache/KnownSourcesCache.cpp @@ -8,8 +8,8 @@ \---------------------------------------------------------------------*/ #include "zypp/base/Logger.h" -#include "zypp/cache/KnownSourcesCache.h" -#include "zypp/cache/SourceCacheInitializer.h" +#include "zypp2/cache/KnownSourcesCache.h" +#include "zypp2/cache/SourceCacheInitializer.h" #include "zypp/target/store/PersistentStorage.h" #define ZYPP_DB_FILE "/var/lib/zypp/zypp.db" diff --git a/zypp2/cache/KnownSourcesCache.h b/zypp2/cache/KnownSourcesCache.h index 08dbadb..df12c71 100644 --- a/zypp2/cache/KnownSourcesCache.h +++ b/zypp2/cache/KnownSourcesCache.h @@ -20,7 +20,7 @@ #include "zypp/base/PtrTypes.h" #include "zypp/source/SourceInfo.h" #include "zypp/Pathname.h" -#include "zypp/cache/sqlite3x/sqlite3x.hpp" +#include "zypp2/cache/sqlite3x/sqlite3x.hpp" /////////////////////////////////////////////////////////////////// namespace zypp diff --git a/zypp2/cache/SourceCache.cpp b/zypp2/cache/SourceCache.cpp index b9f3672..9cca154 100644 --- a/zypp2/cache/SourceCache.cpp +++ b/zypp2/cache/SourceCache.cpp @@ -11,10 +11,10 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" -#include "zypp/cache/SourceCache.h" +#include "zypp2/cache/SourceCache.h" #include "zypp/target/store/PersistentStorage.h" -#include "zypp/cache/SourceCacheInitializer.h" -#include "zypp/cache/Utils.h" +#include "zypp2/cache/SourceCacheInitializer.h" +#include "zypp2/cache/Utils.h" #define ZYPP_DB_FILE "/var/lib/zypp/zypp.db" diff --git a/zypp2/cache/SourceCache.h b/zypp2/cache/SourceCache.h index d63f262..90a014c 100644 --- a/zypp2/cache/SourceCache.h +++ b/zypp2/cache/SourceCache.h @@ -21,7 +21,7 @@ #include "zypp/source/SourceInfo.h" #include "zypp/data/ResolvableData.h" #include "zypp/Pathname.h" -#include "zypp/cache/sqlite3x/sqlite3x.hpp" +#include "zypp2/cache/sqlite3x/sqlite3x.hpp" /////////////////////////////////////////////////////////////////// namespace zypp diff --git a/zypp2/cache/SourceCacheInitializer.cpp b/zypp2/cache/SourceCacheInitializer.cpp index f1e910f..fb4ca75 100644 --- a/zypp2/cache/SourceCacheInitializer.cpp +++ b/zypp2/cache/SourceCacheInitializer.cpp @@ -11,9 +11,9 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" -#include "zypp/cache/SourceCacheInitializer.h" +#include "zypp2/cache/SourceCacheInitializer.h" #include "zypp/target/store/PersistentStorage.h" -#include "zypp/cache/Utils.h" +#include "zypp2/cache/Utils.h" #define ZYPP_DB_FILE "/var/lib/zypp/zypp.db" diff --git a/zypp2/cache/SourceCacheInitializer.h b/zypp2/cache/SourceCacheInitializer.h index 432679e..be1150f 100644 --- a/zypp2/cache/SourceCacheInitializer.h +++ b/zypp2/cache/SourceCacheInitializer.h @@ -17,7 +17,7 @@ #include "zypp/base/NonCopyable.h" #include "zypp/base/PtrTypes.h" #include "zypp/Pathname.h" -#include "zypp/cache/sqlite3x/sqlite3x.hpp" +#include "zypp2/cache/sqlite3x/sqlite3x.hpp" /////////////////////////////////////////////////////////////////// namespace zypp diff --git a/zypp2/cache/SourceCacher.cpp b/zypp2/cache/SourceCacher.cpp index 71a40e6..9a6c154 100644 --- a/zypp2/cache/SourceCacher.cpp +++ b/zypp2/cache/SourceCacher.cpp @@ -8,7 +8,7 @@ \---------------------------------------------------------------------*/ #include "zypp/base/Logger.h" -#include "zypp/cache/SourceCacher.h" +#include "zypp2/cache/SourceCacher.h" using namespace std; diff --git a/zypp2/cache/Utils.cpp b/zypp2/cache/Utils.cpp index 53d5aeb..15a187c 100644 --- a/zypp2/cache/Utils.cpp +++ b/zypp2/cache/Utils.cpp @@ -12,7 +12,7 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" -#include "zypp/cache/Utils.h" +#include "zypp2/cache/Utils.h" using namespace std; diff --git a/zypp2/dummy.cc b/zypp2/dummy.cc new file mode 100644 index 0000000..e69de29 diff --git a/zypp2/source/Makefile.am b/zypp2/source/Makefile.am index ceed323..7e3435f 100644 --- a/zypp2/source/Makefile.am +++ b/zypp2/source/Makefile.am @@ -16,9 +16,9 @@ noinst_LTLIBRARIES = lib@PACKAGE@2_source.la ## ################################################## -lib@PACKAGE@2_source_la_SOURCES = +lib@PACKAGE@2_source_la_SOURCES = dummy.cc -lib@PACKAGE@_source_la_LIBADD = \ +lib@PACKAGE@2_source_la_LIBADD = \ yum/lib@PACKAGE@2_source_yum.la ## ################################################## diff --git a/zypp2/source/dummy.cc b/zypp2/source/dummy.cc new file mode 100644 index 0000000..e69de29 diff --git a/zypp2/source/yum/YUMSourceCacher.cc b/zypp2/source/yum/YUMSourceCacher.cc index 9fd58de..fc0a427 100644 --- a/zypp2/source/yum/YUMSourceCacher.cc +++ b/zypp2/source/yum/YUMSourceCacher.cc @@ -11,7 +11,7 @@ #include "zypp/base/Logger.h" #include "zypp/MediaSetAccess.h" -#include "zypp/cache/SourceCacher.h" +#include "zypp2/cache/SourceCacher.h" #include "zypp/base/GzStream.h" #include "zypp/parser/yum/YUMParser.h" @@ -19,7 +19,7 @@ #include "zypp/parser/SAXParser.h" #include "zypp/parser/yum/YUMParser.h" #include "zypp/parser/yum2/YUMPrimaryParser.h" -#include "zypp/source/yum/YUMSourceCacher.h" +#include "zypp2/source/yum/YUMSourceCacher.h" using namespace std; diff --git a/zypp2/source/yum/YUMSourceCacher.h b/zypp2/source/yum/YUMSourceCacher.h index 08dba66..d7003a7 100644 --- a/zypp2/source/yum/YUMSourceCacher.h +++ b/zypp2/source/yum/YUMSourceCacher.h @@ -13,7 +13,7 @@ #include #include -#include "zypp/cache/SourceCacher.h" +#include "zypp2/cache/SourceCacher.h" #include "zypp/data/ResolvableData.h" #include "zypp/data/ResolvableDataConsumer.h" #include "zypp/Pathname.h" -- 2.7.4