Start moving the attribute store into the library.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd4a10b..0122505 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,10 @@
 
-SET(libsatsolver_SRCS bitmap.c  poolarch.c  poolvendor.c  poolid.c strpool.c
+SET(libsatsolver_SRCS attr_store.c bitmap.c  poolarch.c  poolvendor.c  poolid.c strpool.c
 solver.c repo_solv.c evr.c pool.c queue.c   repo.c  util.c policy.c)
 
 ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS})
 
-SET(libsatsolver_HEADERS bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h repo.h repo_solv.h util.h strpool.h)
+SET(libsatsolver_HEADERS attr_store.h bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h repo.h repo_solv.h util.h strpool.h)
 
 SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall -fPIC" )
 

diff --git a/tools/attr_store.c b/src/attr_store.c
similarity index 100%
rename from tools/attr_store.c
rename to src/attr_store.c

diff --git a/tools/attr_store.h b/src/attr_store.h
similarity index 100%
rename from tools/attr_store.h
rename to src/attr_store.h

diff --git a/tools/attr_store_p.h b/src/attr_store_p.h
similarity index 97%
rename from tools/attr_store_p.h
rename to src/attr_store_p.h
index a5dd214..d23d2c8 100644 (file)
--- a/tools/attr_store_p.h
+++ b/src/attr_store_p.h
@@ -75,6 +75,8 @@ struct _Attrstore
   unsigned int packed:1;
 };
 
+void add_attr_from_file (Attrstore *s, unsigned entry, Id name, int type, FILE *fp);
+
 #define get_num(ptr,val) do { \
   typedef int __wrong_buf__[(1-sizeof((ptr)[0])) * (sizeof((ptr)[0])-1)];\
   val = 0; \

diff --git a/tools/fastlz.c b/src/fastlz.c
similarity index 100%
rename from tools/fastlz.c
rename to src/fastlz.c

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 91eb86d..4ce98bd 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -17,7 +17,7 @@ SET(helix2solv_REPOS helix2solv.c repo_helix.h repo_helix.c repo_write.c )
 ADD_EXECUTABLE( helix2solv ${helix2solv_REPOS} )
 TARGET_LINK_LIBRARIES( helix2solv satsolver ${EXPAT_LIBRARY})
 
-SET(susetags2solv_REPOS susetags2solv.c repo_susetags.h repo_susetags.c repo_write.c attr_store.c)
+SET(susetags2solv_REPOS susetags2solv.c repo_susetags.h repo_susetags.c repo_write.c)
 ADD_EXECUTABLE( susetags2solv ${susetags2solv_REPOS} )
 TARGET_LINK_LIBRARIES( susetags2solv satsolver)
 
@@ -43,7 +43,7 @@ SET(mergesolv_REPOS mergesolv.c repo_write.c)
 ADD_EXECUTABLE( mergesolv ${mergesolv_REPOS} )
 TARGET_LINK_LIBRARIES( mergesolv satsolver)
 
-SET(dumpattr_REPOS dumpattr.c attr_store.c)
+SET(dumpattr_REPOS dumpattr.c)
 ADD_EXECUTABLE( dumpattr ${dumpattr_REPOS} )
 TARGET_LINK_LIBRARIES( dumpattr satsolver)