opkg: split out opkg.h

git-svn-id: http://opkg.googlecode.com/svn/trunk@63 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libopkg/opkg.h b/libopkg/opkg.h
index 1e8baeaa981b116e80c28201a94ca0d68778264b..12a264a2c0bbb97add6dd17f15b572cce88cb958 100644 (file)
--- a/libopkg/opkg.h
+++ b/libopkg/opkg.h
@@ -26,39 +26,8 @@
 #include "opkg_conf.h"
 #include "opkg_message.h"
 
-#define OPKG_PKG_EXTENSION ".ipk"
-#define DPKG_PKG_EXTENSION ".deb"
-
-#define OPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-#define OPKG_PKG_VERSION_SEP_CHAR '_'
-
-#define OPKG_STATE_DIR_PREFIX OPKGLIBDIR"/opkg"
-#define OPKG_LISTS_DIR_SUFFIX "lists"
-#define OPKG_INFO_DIR_SUFFIX "info"
-#define OPKG_STATUS_FILE_SUFFIX "status"
-
-#define OPKG_BACKUP_SUFFIX "-opkg.backup"
-
-#define OPKG_LIST_DESCRIPTION_LENGTH 128
-
-enum opkg_error {
-    OPKG_SUCCESS = 0,
-    OPKG_PKG_DEPS_UNSATISFIED,
-    OPKG_PKG_IS_ESSENTIAL,
-    OPKG_PKG_HAS_DEPENDENTS,
-    OPKG_PKG_HAS_NO_CANDIDATE
-};
-typedef enum opkg_error opkg_error_t;
-
-extern int opkg_state_changed;
-
-
-struct errlist {
-    char * errmsg;
-    struct errlist * next;
-} ;
-
-struct errlist* error_list;
-
+#include "opkg_error.h"
+#include "opkg_defines.h"
+#include "opkg_state.h"
 
 #endif

diff --git a/libopkg/opkg_defines.h b/libopkg/opkg_defines.h
new file mode 100644 (file)
index 0000000..1fdef18
--- /dev/null
+++ b/libopkg/opkg_defines.h
@@ -0,0 +1,34 @@
+/* opkg_defines.h - the opkg package management system
+
+   Copyright (C) 2008 OpenMoko Inc
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+*/
+
+#ifndef OPKG_DEFINES_H
+#define OPKG_DEFINES_H
+
+#define OPKG_PKG_EXTENSION ".ipk"
+#define DPKG_PKG_EXTENSION ".deb"
+
+#define OPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
+#define OPKG_PKG_VERSION_SEP_CHAR '_'
+
+#define OPKG_STATE_DIR_PREFIX OPKGLIBDIR"/opkg"
+#define OPKG_LISTS_DIR_SUFFIX "lists"
+#define OPKG_INFO_DIR_SUFFIX "info"
+#define OPKG_STATUS_FILE_SUFFIX "status"
+
+#define OPKG_BACKUP_SUFFIX "-opkg.backup"
+
+#define OPKG_LIST_DESCRIPTION_LENGTH 128
+
+#endif /* OPKG_DEFINES_H */

diff --git a/libopkg/opkg_error.h b/libopkg/opkg_error.h
new file mode 100644 (file)
index 0000000..54fa7fc
--- /dev/null
+++ b/libopkg/opkg_error.h
@@ -0,0 +1,36 @@
+/* opkg_error.h - the opkg package management system
+
+   Copyright (C) 2008 OpenMoko Inc
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+*/
+
+#ifndef OPKG_ERROR_H
+#define OPKG_ERROR_H
+
+enum opkg_error {
+    OPKG_SUCCESS = 0,
+    OPKG_PKG_DEPS_UNSATISFIED,
+    OPKG_PKG_IS_ESSENTIAL,
+    OPKG_PKG_HAS_DEPENDENTS,
+    OPKG_PKG_HAS_NO_CANDIDATE
+};
+typedef enum opkg_error opkg_error_t;
+
+
+struct errlist {
+    char * errmsg;
+    struct errlist * next;
+} ;
+
+struct errlist* error_list;
+
+#endif /* OPKG_ERROR_H */

diff --git a/libopkg/opkg_state.h b/libopkg/opkg_state.h
index d2e8e384d9eebfc28355538f74cafb0de5d698b8..9442d939487dbdc21988231970d7cd4d33cd5472 100644 (file)
--- a/libopkg/opkg_state.h
+++ b/libopkg/opkg_state.h
@@ -20,6 +20,8 @@
 
 #include <opkg_message.h>
 
+extern int opkg_state_changed;
+
 typedef enum _opkg_state {
   OPKG_STATE_NONE,
   OPKG_STATE_DOWNLOADING_PKG,