summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-12-01 15:23:06 -0500
committerAnthony G. Basile <blueness@gentoo.org>2012-12-01 15:23:06 -0500
commit0de7e6af114aae2e19af0b3574f91de8df89a4c3 (patch)
tree4a1d37d8d6b7641d9280d64adc00414b7ba96957
parent6ea07b48a52babf89d94888b13320bdf6a63a420 (diff)
Include config.h in src/libudev/Makefile.am to provide needed #define's
This commit provides needed #define's that provide structures that are found at configure time. It also reverts commit 91ce21b2d7978837b233e152ac63863a910eaf21 to avoid redefinitions of _GNU_SOURCE. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--src/libudev/Makefile.am1
-rw-r--r--src/libudev/libudev-monitor.c2
-rw-r--r--src/libudev/log.c1
-rw-r--r--src/libudev/path-util.c2
-rw-r--r--src/libudev/util.c2
5 files changed, 1 insertions, 7 deletions
diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am
index 3288ab531b..dfc8cb17d6 100644
--- a/src/libudev/Makefile.am
+++ b/src/libudev/Makefile.am
@@ -5,6 +5,7 @@ LIBUDEV_REVISION=0
LIBUDEV_AGE=2
AM_CPPFLAGS = \
+ -include $(top_builddir)/config.h \
-DUDEV_CONF_FILE=\"$(udevconffile)\" \
-DUDEV_HWDB_BIN=\"$(udevhwdbbin)\" \
-I $(top_srcdir)/src/udev
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 7c5d9d6e45..b02ea8808c 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -17,8 +17,6 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#define _GNU_SOURCE
-
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
diff --git a/src/libudev/log.c b/src/libudev/log.c
index 8328cf6b20..5c07b626c2 100644
--- a/src/libudev/log.c
+++ b/src/libudev/log.c
@@ -18,7 +18,6 @@
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#define _GNU_SOURCE
#include <stdarg.h>
#include <stdio.h>
diff --git a/src/libudev/path-util.c b/src/libudev/path-util.c
index de9ec296df..70c8a8af06 100644
--- a/src/libudev/path-util.c
+++ b/src/libudev/path-util.c
@@ -19,8 +19,6 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#define _GNU_SOURCE
-
#include <assert.h>
#include <string.h>
#include <unistd.h>
diff --git a/src/libudev/util.c b/src/libudev/util.c
index 08162e2a73..d8c5bb2e1e 100644
--- a/src/libudev/util.c
+++ b/src/libudev/util.c
@@ -19,8 +19,6 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#define _GNU_SOURCE
-
#include <assert.h>
#include <string.h>
#include <unistd.h>