Move dselect specific macros from dpkg.h to dselect/method.h

ChangeLog

@@ -1,3 +1,12 @@
+2008-08-18  Guillem Jover  <guillem@debian.org>
+
+	* lib/dpkg.h (CMETHOPTFILE, METHLOCKFILE, METHODSDIR)
+	(IMETHODMAXLEN, IOPTIONMAXLEN, METHODOPTIONSFILE)
+	(METHODSETUPSCRIPT, METHODUPDATESCRIPT, METHODINSTALLSCRIPT)
+	(OPTIONSDESCPFX, OPTIONINDEXMAXLEN): Move macros ...
+	* dselect/method.h: ... here.
+	* dselect/methparse.cc: Include "method.h".
+
 2008-08-18  Guillem Jover  <guillem@debian.org>
 
 	* man/dpkg-trigger.1: Mark program names in bold.

dselect/method.h

@@ -23,6 +23,20 @@
 #ifndef METHOD_H
 #define METHOD_H
 
+#define CMETHOPTFILE		"cmethopt"
+#define METHLOCKFILE		"methlock"
+
+#define METHODSDIR		"methods"
+
+#define IMETHODMAXLEN		50
+#define IOPTIONMAXLEN		IMETHODMAXLEN
+#define METHODOPTIONSFILE	"names"
+#define METHODSETUPSCRIPT	"setup"
+#define METHODUPDATESCRIPT	"update"
+#define METHODINSTALLSCRIPT	"install"
+#define OPTIONSDESCPFX		"desc."
+#define OPTIONINDEXMAXLEN	5
+
 struct method {
   struct method *next, *back;
   char *name, *path, *pathinmeth;

dselect/methparse.cc

@@ -42,6 +42,7 @@ extern "C" {
 }
 #include "dselect.h"
 #include "bindings.h"
+#include "method.h"
 
 int noptions=0;
 struct dselect_option *options=0, *coption=0;

lib/dpkg.h

@@ -89,8 +89,6 @@
 #define STATUSFILE        "status"
 #define AVAILFILE         "available"
 #define LOCKFILE          "lock"
-#define CMETHOPTFILE      "cmethopt"
-#define METHLOCKFILE      "methlock"
 #define DIVERSIONSFILE    "diversions"
 #define STATOVERRIDEFILE  "statoverride"
 #define UPDATESDIR        "updates/"
@@ -111,7 +109,6 @@
 #define MAINTSCRIPTDPKGENVVAR "DPKG_RUNNING_VERSION"
 
 #define LOCALLIBDIR         "/usr/local/lib/dpkg"
-#define METHODSDIR          "methods"
 
 #define NOJOBCTRLSTOPENV    "DPKG_NO_TSTP"
 #define SHELLENV            "SHELL"
@@ -119,15 +116,6 @@
 #define PAGERENV            "PAGER"
 #define DEFAULTPAGER        "pager"
 
-#define IMETHODMAXLEN        50
-#define IOPTIONMAXLEN        IMETHODMAXLEN
-#define METHODOPTIONSFILE   "names"
-#define METHODSETUPSCRIPT   "setup"
-#define METHODUPDATESCRIPT  "update"
-#define METHODINSTALLSCRIPT "install"
-#define OPTIONSDESCPFX      "desc."
-#define OPTIONINDEXMAXLEN    5
-
 #define PKGSCRIPTMAXARGS     10
 #define MD5HASHLEN           32
 #define MAXTRIGDIRECTIVE     256