From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Fri, 3 Oct 2014 01:03:19 +0000 (-0300)
Subject: Move macro.h to shared directory
X-Git-Tag: v19~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=576dd4393d0deb2f4e050c5d1b96eaafb03bcb2c;p=platform%2Fupstream%2Fkmod.git

Move macro.h to shared directory

It's not really related to libkmod, so move it to a directory in which
we keep common stuff.
---

diff --git a/Makefile.am b/Makefile.am
index eb63073..8724de5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ AM_MAKEFLAGS = --no-print-directory
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-I$(top_srcdir)/libkmod \
+	-I$(top_srcdir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DLIBEXECDIR=\""$(libexecdir)"\" \
 	${zlib_CFLAGS}
@@ -53,9 +54,9 @@ include_HEADERS = libkmod/libkmod.h
 lib_LTLIBRARIES = libkmod/libkmod.la
 
 libkmod_libkmod_la_SOURCES =\
+	shared/macro.h \
 	libkmod/libkmod.h \
 	libkmod/libkmod-internal.h \
-	libkmod/macro.h \
 	libkmod/missing.h \
 	libkmod/libkmod.c \
 	libkmod/libkmod-list.c \
diff --git a/libkmod/docs/Makefile.am b/libkmod/docs/Makefile.am
index 7c67581..673c93b 100644
--- a/libkmod/docs/Makefile.am
+++ b/libkmod/docs/Makefile.am
@@ -20,8 +20,7 @@ MKHTML_OPTIONS = --path=$(abs_srcdir)/doc --path=$(abs_builddir)/doc
 HFILE_GLOB = $(top_srcdir)/libkmod/libkmod.h
 CFILE_GLOB = $(top_srcdir)/libkmod/libkmod.c $(top_srcdir)/libkmod/libkmod-module.c $(top_srcdir)/libkmod/libkmod-list.c
 
-IGNORE_HFILES = macro.h \
-		libkmod-internal.h \
+IGNORE_HFILES = libkmod-internal.h \
 		libkmod-util.h \
 		libkmod-array.h \
 		libkmod-hash.h \
diff --git a/libkmod/libkmod-index.c b/libkmod/libkmod-index.c
index 13199a2..1c64743 100644
--- a/libkmod/libkmod-index.c
+++ b/libkmod/libkmod-index.c
@@ -27,9 +27,10 @@
 #include <assert.h>
 #include <inttypes.h>
 
+#include <shared/macro.h>
+
 #include "libkmod-internal.h"
 #include "libkmod-index.h"
-#include "macro.h"
 
 /* index.c: module index file shared functions for modprobe and depmod */
 
diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
index 93a00c1..5e12d0d 100644
--- a/libkmod/libkmod-internal.h
+++ b/libkmod/libkmod-internal.h
@@ -5,8 +5,9 @@
 #include <syslog.h>
 #include <limits.h>
 
+#include <shared/macro.h>
+
 #include "missing.h"
-#include "macro.h"
 #include "libkmod.h"
 
 static _always_inline_ _printf_format_(2, 3) void
diff --git a/libkmod/libkmod-util.h b/libkmod/libkmod-util.h
index bc1ed4d..f3e9c68 100644
--- a/libkmod/libkmod-util.h
+++ b/libkmod/libkmod-util.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "macro.h"
 
 #include <limits.h>
 #include <stdbool.h>
@@ -8,6 +7,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <shared/macro.h>
 
 char *getline_wrapped(FILE *fp, unsigned int *linenum) __attribute__((nonnull(1)));
 #define streq(a, b) (strcmp((a), (b)) == 0)
diff --git a/libkmod/macro.h b/shared/macro.h
similarity index 97%
rename from libkmod/macro.h
rename to shared/macro.h
index b033bba..0f8e4c0 100644
--- a/libkmod/macro.h
+++ b/shared/macro.h
@@ -1,5 +1,5 @@
 /*
- * libkmod - interface to kernel module operations
+ * kmod - interface to kernel module operations
  *
  * Copyright (C) 2011-2013  ProFUSION embedded systems
  *
diff --git a/testsuite/testsuite.h b/testsuite/testsuite.h
index c90a1d5..930f4af 100644
--- a/testsuite/testsuite.h
+++ b/testsuite/testsuite.h
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 
-#include "macro.h"
+#include <shared/macro.h>
 
 struct test;
 typedef int (*testfunc)(const struct test *t);
diff --git a/tools/depmod.c b/tools/depmod.c
index e90ff83..41cad0b 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -21,6 +21,8 @@
 #include "libkmod-hash.h"
 #include "libkmod-util.h"
 
+#include <shared/macro.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
@@ -119,7 +121,6 @@ static inline void _show(const char *fmt, ...)
 
 /* binary index write *************************************************/
 #include <arpa/inet.h>
-#include "macro.h"
 /* BEGIN: code from module-init-tools/index.c just modified to compile here.
  *
  * Original copyright:
diff --git a/tools/kmod.h b/tools/kmod.h
index 68a646a..50adda4 100644
--- a/tools/kmod.h
+++ b/tools/kmod.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "macro.h"
+#include <shared/macro.h>
 
 struct kmod_cmd {
 	const char *name;
diff --git a/tools/modprobe.c b/tools/modprobe.c
index 6b34658..eb3a36b 100644
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -33,7 +33,7 @@
 
 #include "libkmod.h"
 #include "libkmod-array.h"
-#include "macro.h"
+#include <shared/macro.h>
 
 #include "kmod.h"
 
diff --git a/tools/rmmod.c b/tools/rmmod.c
index df2f041..8a3c22e 100644
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "libkmod.h"
-#include "macro.h"
+#include <shared/macro.h>
 
 #include "kmod.h"