diff options
| author | Guillem Jover <guillem@debian.org> | 2009-07-15 15:42:48 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2009-07-15 21:16:09 +0200 |
| commit | 7fa96f351b61259f741bcd952beb9468f0c7516c (patch) | |
| tree | 9815642a92e7ead29b9b50205b45736b82a4206c /dpkg-split | |
| parent | 4a7010fe5e3573cc919788d354fdbccdedce249d (diff) | |
| download | dpkg-7fa96f351b61259f741bcd952beb9468f0c7516c.tar.gz | |
Disable default automake preprocessor include paths
Tell automake not to add “-I.” to the preprocessor flags, to avoid
file collisions with system headers. Re-add the path where config.h
is located. Namespace and use bracketed file inclusions for libdpkg
headers, and use quoted inclusions for program headers.
Diffstat (limited to 'dpkg-split')
| -rw-r--r-- | dpkg-split/Makefile.am | 2 | ||||
| -rw-r--r-- | dpkg-split/info.c | 7 | ||||
| -rw-r--r-- | dpkg-split/join.c | 7 | ||||
| -rw-r--r-- | dpkg-split/main.c | 6 | ||||
| -rw-r--r-- | dpkg-split/queue.c | 7 | ||||
| -rw-r--r-- | dpkg-split/split.c | 7 |
6 files changed, 20 insertions, 16 deletions
diff --git a/dpkg-split/Makefile.am b/dpkg-split/Makefile.am index 4d1421298..63d285bd7 100644 --- a/dpkg-split/Makefile.am +++ b/dpkg-split/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = \ -DLOCALEDIR=\"$(localedir)\" \ -DADMINDIR=\"$(admindir)\" -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \ -idirafter $(top_srcdir)/lib/compat \ - -I$(top_srcdir)/lib/dpkg \ + -I$(top_builddir) \ -I$(top_srcdir)/lib diff --git a/dpkg-split/info.c b/dpkg-split/info.c index eab08fd1e..2962edd7a 100644 --- a/dpkg-split/info.c +++ b/dpkg-split/info.c @@ -22,7 +22,6 @@ #include <compat.h> #include <dpkg/i18n.h> -#include <myopt.h> #include <stdio.h> #include <stdlib.h> @@ -34,8 +33,10 @@ #include <ar.h> #include <ctype.h> -#include <dpkg.h> -#include <dpkg-db.h> +#include <dpkg/dpkg.h> +#include <dpkg/dpkg-db.h> +#include <dpkg/myopt.h> + #include "dpkg-split.h" static unsigned long unsignedlong(const char *value, const char *fn, const char *what) { diff --git a/dpkg-split/join.c b/dpkg-split/join.c index 5add3942c..5da5e2204 100644 --- a/dpkg-split/join.c +++ b/dpkg-split/join.c @@ -22,7 +22,6 @@ #include <compat.h> #include <dpkg/i18n.h> -#include <myopt.h> #include <stdio.h> #include <stdlib.h> @@ -30,8 +29,10 @@ #include <assert.h> #include <string.h> -#include <dpkg.h> -#include <dpkg-db.h> +#include <dpkg/dpkg.h> +#include <dpkg/dpkg-db.h> +#include <dpkg/myopt.h> + #include "dpkg-split.h" void reassemble(struct partinfo **partlist, const char *outputfile) { diff --git a/dpkg-split/main.c b/dpkg-split/main.c index 6076a6dc9..b019a2b67 100644 --- a/dpkg-split/main.c +++ b/dpkg-split/main.c @@ -36,9 +36,9 @@ #endif #include <dpkg/macros.h> -#include <dpkg.h> -#include <dpkg-db.h> -#include <myopt.h> +#include <dpkg/dpkg.h> +#include <dpkg/dpkg-db.h> +#include <dpkg/myopt.h> #include "dpkg-split.h" diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c index 26bc0a01c..105fce2d2 100644 --- a/dpkg-split/queue.c +++ b/dpkg-split/queue.c @@ -31,7 +31,6 @@ #include <compat.h> #include <dpkg/i18n.h> -#include <myopt.h> #include <stdio.h> #include <stdlib.h> @@ -43,8 +42,10 @@ #include <dirent.h> #include <string.h> -#include <dpkg.h> -#include <dpkg-db.h> +#include <dpkg/dpkg.h> +#include <dpkg/dpkg-db.h> +#include <dpkg/myopt.h> + #include "dpkg-split.h" static int decompose_filename(const char *filename, struct partqueue *pq) { diff --git a/dpkg-split/split.c b/dpkg-split/split.c index a7d3acbb5..a8ceaa92a 100644 --- a/dpkg-split/split.c +++ b/dpkg-split/split.c @@ -22,7 +22,6 @@ #include <compat.h> #include <dpkg/i18n.h> -#include <myopt.h> #include <stdio.h> #include <stdlib.h> @@ -32,8 +31,10 @@ #include <sys/stat.h> #include <fcntl.h> -#include <dpkg.h> -#include <dpkg-db.h> +#include <dpkg/dpkg.h> +#include <dpkg/dpkg-db.h> +#include <dpkg/myopt.h> + #include "dpkg-split.h" void do_split(const char *const *argv) { |