- Moving helix parser to the API

- deptestomatic: Using helix-file for fallback if the solv-file does not
  exist.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 824f4de..b396727 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 dirpool.c
-solver.c repo_solv.c evr.c pool.c queue.c   repo.c  repodata.c util.c policy.c)
+solver.c repo_solv.c repo_helix.c evr.c pool.c queue.c   repo.c  repodata.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 repodata.h repo_solv.h util.h strpool.h dirpool.h)
+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 repodata.h repo_solv.h repo_helix.h util.h strpool.h dirpool.h)
 
 SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
 

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

diff --git a/tools/repo_helix.h b/src/repo_helix.h
similarity index 61%
rename from tools/repo_helix.h
rename to src/repo_helix.h
index 59d3996..4ab0862 100644 (file)
--- a/tools/repo_helix.h
+++ b/src/repo_helix.h
@@ -10,8 +10,12 @@
  * 
  */
 
-#ifndef REPO_HELIX_H
-#define REPO_HELIX_H
+#ifndef SATSOLVER_REPO_HELIX_H
+#define SATSOLVER_REPO_HELIX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include <stdio.h>
 #include "pool.h"
@@ -19,4 +23,9 @@
 
 extern void repo_add_helix(Repo *repo, FILE *fp);
 
-#endif /* REPO_HELIX_H */
+#ifdef __cplusplus
+}
+#endif
+    
+
+#endif /* SATSOLVER_REPO_HELIX_H */

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 43c35df..fc048a4 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(rpmmd2solv_REPOS rpmmd2solv.c repo_rpmmd.h repo_rpmmd.c repo_write.c common_
 ADD_EXECUTABLE( rpmmd2solv ${rpmmd2solv_REPOS} )
 TARGET_LINK_LIBRARIES( rpmmd2solv satsolver ${EXPAT_LIBRARY})
 
-SET(helix2solv_REPOS helix2solv.c repo_helix.h repo_helix.c repo_write.c common_write.c )
+SET(helix2solv_REPOS helix2solv.c repo_write.c common_write.c )
 ADD_EXECUTABLE( helix2solv ${helix2solv_REPOS} )
 TARGET_LINK_LIBRARIES( helix2solv satsolver ${EXPAT_LIBRARY})