summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblueness <basile@opensource.dyc.edu>2014-08-06 06:36:03 -0400
committerblueness <basile@opensource.dyc.edu>2014-08-06 06:36:03 -0400
commitcb2823bc026644ae56c9d257591d28a4f3110f4b (patch)
tree28cdd75fec8c6c6a2cf69c9668add048c10370f8
parent4b8733ffe9c0fe8e5a527186d323dab93e43fb37 (diff)
parentb1ac60946d1625e14029ea9b7fa3aa4c06e0795f (diff)
Merge pull request #96 from gentoo/refactor-shared
src/shared: refactor shared code
-rw-r--r--.gitignore20
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/accelerometer/Makefile.am4
-rw-r--r--src/ata_id/Makefile.am4
-rw-r--r--src/cdrom_id/Makefile.am4
-rw-r--r--src/collect/Makefile.am4
-rw-r--r--src/libudev/Makefile.am54
-rw-r--r--src/scsi_id/Makefile.am4
-rw-r--r--src/shared/Makefile.am63
-rw-r--r--src/shared/MurmurHash2.c (renamed from src/libudev/MurmurHash2.c)0
-rw-r--r--src/shared/MurmurHash2.h (renamed from src/libudev/MurmurHash2.h)0
-rw-r--r--src/shared/cgroup-util.c (renamed from src/libudev/cgroup-util.c)0
-rw-r--r--src/shared/cgroup-util.h (renamed from src/libudev/cgroup-util.h)0
-rw-r--r--src/shared/conf-files.c (renamed from src/libudev/conf-files.c)0
-rw-r--r--src/shared/conf-files.h (renamed from src/libudev/conf-files.h)0
-rw-r--r--src/shared/def.h (renamed from src/libudev/def.h)0
-rw-r--r--src/shared/dev-setup.c (renamed from src/udev/dev-setup.c)0
-rw-r--r--src/shared/dev-setup.h (renamed from src/udev/dev-setup.h)0
-rw-r--r--src/shared/device-nodes.c (renamed from src/libudev/device-nodes.c)0
-rw-r--r--src/shared/device-nodes.h (renamed from src/libudev/device-nodes.h)0
-rw-r--r--src/shared/exit-status.c (renamed from src/libudev/exit-status.c)0
-rw-r--r--src/shared/exit-status.h (renamed from src/libudev/exit-status.h)0
-rw-r--r--src/shared/fileio.c (renamed from src/libudev/fileio.c)0
-rw-r--r--src/shared/fileio.h (renamed from src/libudev/fileio.h)0
-rw-r--r--src/shared/hashmap.c (renamed from src/libudev/hashmap.c)0
-rw-r--r--src/shared/hashmap.h (renamed from src/libudev/hashmap.h)0
-rw-r--r--src/shared/ioprio.h (renamed from src/libudev/ioprio.h)0
-rw-r--r--src/shared/label.c (renamed from src/udev/label.c)0
-rw-r--r--src/shared/label.h (renamed from src/udev/label.h)0
-rw-r--r--src/shared/log.c (renamed from src/libudev/log.c)0
-rw-r--r--src/shared/log.h (renamed from src/libudev/log.h)0
-rw-r--r--src/shared/macro.h (renamed from src/libudev/macro.h)0
-rw-r--r--src/shared/missing.h (renamed from src/libudev/missing.h)0
-rw-r--r--src/shared/mkdir.c (renamed from src/udev/mkdir.c)0
-rw-r--r--src/shared/mkdir.h (renamed from src/udev/mkdir.h)0
-rw-r--r--src/shared/path-util.c (renamed from src/libudev/path-util.c)0
-rw-r--r--src/shared/path-util.h (renamed from src/libudev/path-util.h)0
-rw-r--r--src/shared/set.c (renamed from src/libudev/set.c)0
-rw-r--r--src/shared/set.h (renamed from src/libudev/set.h)0
-rw-r--r--src/shared/siphash24.c (renamed from src/libudev/siphash24.c)0
-rw-r--r--src/shared/siphash24.h (renamed from src/libudev/siphash24.h)0
-rw-r--r--src/shared/smack-util.c (renamed from src/udev/smack-util.c)0
-rw-r--r--src/shared/smack-util.h (renamed from src/udev/smack-util.h)0
-rw-r--r--src/shared/socket-util.h (renamed from src/libudev/socket-util.h)0
-rw-r--r--src/shared/sparse-endian.h (renamed from src/libudev/sparse-endian.h)0
-rw-r--r--src/shared/strbuf.c (renamed from src/libudev/strbuf.c)0
-rw-r--r--src/shared/strbuf.h (renamed from src/libudev/strbuf.h)0
-rw-r--r--src/shared/strv.c (renamed from src/libudev/strv.c)0
-rw-r--r--src/shared/strv.h (renamed from src/libudev/strv.h)0
-rw-r--r--src/shared/strxcpyx.c (renamed from src/libudev/strxcpyx.c)0
-rw-r--r--src/shared/strxcpyx.h (renamed from src/libudev/strxcpyx.h)0
-rw-r--r--src/shared/time-util.c (renamed from src/libudev/time-util.c)0
-rw-r--r--src/shared/time-util.h (renamed from src/libudev/time-util.h)0
-rw-r--r--src/shared/udev-util.h (renamed from src/udev/udev-util.h)0
-rw-r--r--src/shared/utf8.c (renamed from src/libudev/utf8.c)0
-rw-r--r--src/shared/utf8.h (renamed from src/libudev/utf8.h)0
-rw-r--r--src/shared/util.c (renamed from src/libudev/util.c)0
-rw-r--r--src/shared/util.h (renamed from src/libudev/util.h)0
-rw-r--r--src/udev/Makefile.am18
-rw-r--r--test/Makefile.am4
61 files changed, 106 insertions, 75 deletions
diff --git a/.gitignore b/.gitignore
index 7fb273fb21..031b36aa4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,9 +29,25 @@ m4/ltversion.m4
m4/lt~obsolete.m4
docs/gudev/version.xml
+docs/gudev/*.txt
+docs/gudev/*.stamp
+docs/gudev/gudev.args
+docs/gudev/gudev.hierarchy
+docs/gudev/gudev.interfaces
+docs/gudev/gudev.prerequisites
+docs/gudev/gudev.signals
+docs/gudev/html/
+docs/gudev/xml/
docs/libudev/version.xml
-docs/gudev/gudev-overrides.txt
-docs/libudev/libudev-overrides.txt
+docs/libudev/*.txt
+docs/libudev/*.stamp
+docs/libudev/libudev.args
+docs/libudev/libudev.hierarchy
+docs/libudev/libudev.interfaces
+docs/libudev/libudev.prerequisites
+docs/libudev/libudev.signals
+docs/libudev/html/
+docs/libudev/xml/
man/udev.7
man/udev.conf.5
man/udevd.8
diff --git a/configure.ac b/configure.ac
index 6945976027..ca71aa9e1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,6 +383,7 @@ AC_CONFIG_FILES([Makefile
src/v4l_id/Makefile
src/gudev/Makefile
src/gudev/gudev-1.0.pc
+ src/shared/Makefile
src/libudev/Makefile
src/libudev/libudev.pc
src/udev/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index d6079f051b..41c66215e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
+ shared \
libudev \
udev
diff --git a/src/accelerometer/Makefile.am b/src/accelerometer/Makefile.am
index 0afa86f2cb..983cf003d0 100644
--- a/src/accelerometer/Makefile.am
+++ b/src/accelerometer/Makefile.am
@@ -1,8 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS = \
- -I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/shared \
+ -I $(top_srcdir)/src/libudev
udevlibexec_PROGRAMS = \
accelerometer
diff --git a/src/ata_id/Makefile.am b/src/ata_id/Makefile.am
index d0c6a46e12..2dca2c1257 100644
--- a/src/ata_id/Makefile.am
+++ b/src/ata_id/Makefile.am
@@ -1,8 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS = \
- -I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/shared \
+ -I $(top_srcdir)/src/libudev
udevlibexec_PROGRAMS = \
ata_id
diff --git a/src/cdrom_id/Makefile.am b/src/cdrom_id/Makefile.am
index 9466bd84a3..488edcadb1 100644
--- a/src/cdrom_id/Makefile.am
+++ b/src/cdrom_id/Makefile.am
@@ -1,8 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS = \
- -I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/shared \
+ -I $(top_srcdir)/src/libudev
udevlibexec_PROGRAMS = \
cdrom_id
diff --git a/src/collect/Makefile.am b/src/collect/Makefile.am
index cdfe54d8a0..361a5a2094 100644
--- a/src/collect/Makefile.am
+++ b/src/collect/Makefile.am
@@ -1,8 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS = \
- -I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/shared \
+ -I $(top_srcdir)/src/libudev
udevlibexec_PROGRAMS = \
collect
diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am
index e3971708fb..3b1b075a64 100644
--- a/src/libudev/Makefile.am
+++ b/src/libudev/Makefile.am
@@ -1,8 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=6
-LIBUDEV_AGE=1
+LIBUDEV_CURRENT=6
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=5
define move-to-rootlibdir
if test "$(libdir)" != "$(rootlibdir)"; then \
@@ -19,7 +19,7 @@ AM_CPPFLAGS = \
-DUDEV_CONF_FILE=\"$(udevconffile)\" \
-DUDEV_HWDB_BIN=\"$(udevhwdbbin)\" \
-DUDEV_VERSION=$(UDEV_VERSION) \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/shared
lib_LTLIBRARIES = \
libudev.la
@@ -32,51 +32,11 @@ libudev_la_SOURCES =\
libudev-enumerate.c \
libudev-monitor.c \
libudev-queue.c \
- libudev-hwdb.c \
- cgroup-util.c \
- conf-files.c \
- device-nodes.c \
- exit-status.c \
- fileio.c \
- hashmap.c \
- log.c \
- MurmurHash2.c \
- path-util.c \
- set.c \
- siphash24.c \
- strbuf.c \
- strv.c \
- strxcpyx.c \
- time-util.c \
- util.c \
- utf8.c
+ libudev-hwdb.c
noinst_HEADERS = \
libudev-hwdb-def.h \
- libudev-private.h \
- cgroup-util.h \
- conf-files.h \
- def.h \
- device-nodes.h \
- exit-status.h \
- fileio.h \
- hashmap.h \
- ioprio.h \
- log.h \
- macro.h \
- missing.h \
- MurmurHash2.h \
- path-util.h \
- set.h \
- siphash24.h \
- socket-util.h \
- sparse-endian.h \
- strbuf.h \
- strv.h \
- strxcpyx.h \
- time-util.h \
- util.h \
- utf8.h
+ libudev-private.h
include_HEADERS = \
libudev.h
@@ -86,6 +46,8 @@ libudev_la_LDFLAGS = \
-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
+libudev_la_LIBADD = \
+ $(top_builddir)/src/shared/libudev_shared.la
libudev_private_la_SOURCES =\
libudev-device-private.c
diff --git a/src/scsi_id/Makefile.am b/src/scsi_id/Makefile.am
index 6050eb9347..89fa18a550 100644
--- a/src/scsi_id/Makefile.am
+++ b/src/scsi_id/Makefile.am
@@ -1,8 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS = \
- -I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/shared \
+ -I $(top_srcdir)/src/libudev
udevlibexec_PROGRAMS = \
scsi_id
diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am
new file mode 100644
index 0000000000..b4c2000301
--- /dev/null
+++ b/src/shared/Makefile.am
@@ -0,0 +1,63 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+AM_CPPFLAGS = \
+ -include $(top_builddir)/config.h
+
+libudev_shared_la_SOURCES=\
+ cgroup-util.c \
+ conf-files.c \
+ device-nodes.c \
+ exit-status.c \
+ fileio.c \
+ hashmap.c \
+ log.c \
+ MurmurHash2.c \
+ path-util.c \
+ set.c \
+ siphash24.c \
+ strbuf.c \
+ strv.c \
+ strxcpyx.c \
+ time-util.c \
+ util.c \
+ utf8.c \
+ dev-setup.c \
+ label.c \
+ mkdir.c \
+ smack-util.c
+
+noinst_HEADERS = \
+ cgroup-util.h \
+ conf-files.h \
+ def.h \
+ device-nodes.h \
+ exit-status.h \
+ fileio.h \
+ hashmap.h \
+ ioprio.h \
+ log.h \
+ macro.h \
+ missing.h \
+ MurmurHash2.h \
+ path-util.h \
+ set.h \
+ siphash24.h \
+ socket-util.h \
+ sparse-endian.h \
+ strbuf.h \
+ strv.h \
+ strxcpyx.h \
+ time-util.h \
+ util.h \
+ utf8.h \
+ dev-setup.h \
+ label.h \
+ mkdir.h \
+ smack-util.h \
+ udev-util.h
+
+libudev_shared_la_LDFLAGS = \
+ $(AM_LDFLAGS)
+
+noinst_LTLIBRARIES = \
+ libudev_shared.la
diff --git a/src/libudev/MurmurHash2.c b/src/shared/MurmurHash2.c
index 2f4149dbe9..2f4149dbe9 100644
--- a/src/libudev/MurmurHash2.c
+++ b/src/shared/MurmurHash2.c
diff --git a/src/libudev/MurmurHash2.h b/src/shared/MurmurHash2.h
index 93362dd485..93362dd485 100644
--- a/src/libudev/MurmurHash2.h
+++ b/src/shared/MurmurHash2.h
diff --git a/src/libudev/cgroup-util.c b/src/shared/cgroup-util.c
index af6ce959c1..af6ce959c1 100644
--- a/src/libudev/cgroup-util.c
+++ b/src/shared/cgroup-util.c
diff --git a/src/libudev/cgroup-util.h b/src/shared/cgroup-util.h
index 11e7308e19..11e7308e19 100644
--- a/src/libudev/cgroup-util.h
+++ b/src/shared/cgroup-util.h
diff --git a/src/libudev/conf-files.c b/src/shared/conf-files.c
index dc4f970313..dc4f970313 100644
--- a/src/libudev/conf-files.c
+++ b/src/shared/conf-files.c
diff --git a/src/libudev/conf-files.h b/src/shared/conf-files.h
index a0720dc2cc..a0720dc2cc 100644
--- a/src/libudev/conf-files.h
+++ b/src/shared/conf-files.h
diff --git a/src/libudev/def.h b/src/shared/def.h
index d4844f4186..d4844f4186 100644
--- a/src/libudev/def.h
+++ b/src/shared/def.h
diff --git a/src/udev/dev-setup.c b/src/shared/dev-setup.c
index 1a565d5470..1a565d5470 100644
--- a/src/udev/dev-setup.c
+++ b/src/shared/dev-setup.c
diff --git a/src/udev/dev-setup.h b/src/shared/dev-setup.h
index d41b6eefba..d41b6eefba 100644
--- a/src/udev/dev-setup.h
+++ b/src/shared/dev-setup.h
diff --git a/src/libudev/device-nodes.c b/src/shared/device-nodes.c
index 5ddcaf042c..5ddcaf042c 100644
--- a/src/libudev/device-nodes.c
+++ b/src/shared/device-nodes.c
diff --git a/src/libudev/device-nodes.h b/src/shared/device-nodes.h
index 57ed97d326..57ed97d326 100644
--- a/src/libudev/device-nodes.h
+++ b/src/shared/device-nodes.h
diff --git a/src/libudev/exit-status.c b/src/shared/exit-status.c
index 79bb8ca981..79bb8ca981 100644
--- a/src/libudev/exit-status.c
+++ b/src/shared/exit-status.c
diff --git a/src/libudev/exit-status.h b/src/shared/exit-status.h
index e2570c65d2..e2570c65d2 100644
--- a/src/libudev/exit-status.h
+++ b/src/shared/exit-status.h
diff --git a/src/libudev/fileio.c b/src/shared/fileio.c
index fe27b23001..fe27b23001 100644
--- a/src/libudev/fileio.c
+++ b/src/shared/fileio.c
diff --git a/src/libudev/fileio.h b/src/shared/fileio.h
index 55c5d92486..55c5d92486 100644
--- a/src/libudev/fileio.h
+++ b/src/shared/fileio.h
diff --git a/src/libudev/hashmap.c b/src/shared/hashmap.c
index b92c83202e..b92c83202e 100644
--- a/src/libudev/hashmap.c
+++ b/src/shared/hashmap.c
diff --git a/src/libudev/hashmap.h b/src/shared/hashmap.h
index 387c32243e..387c32243e 100644
--- a/src/libudev/hashmap.h
+++ b/src/shared/hashmap.h
diff --git a/src/libudev/ioprio.h b/src/shared/ioprio.h
index 950e59b237..950e59b237 100644
--- a/src/libudev/ioprio.h
+++ b/src/shared/ioprio.h
diff --git a/src/udev/label.c b/src/shared/label.c
index dca2a21228..dca2a21228 100644
--- a/src/udev/label.c
+++ b/src/shared/label.c
diff --git a/src/udev/label.h b/src/shared/label.h
index a8dbcdc8b7..a8dbcdc8b7 100644
--- a/src/udev/label.h
+++ b/src/shared/label.h
diff --git a/src/libudev/log.c b/src/shared/log.c
index cd496cf6c5..cd496cf6c5 100644
--- a/src/libudev/log.c
+++ b/src/shared/log.c
diff --git a/src/libudev/log.h b/src/shared/log.h
index 1b2a67a030..1b2a67a030 100644
--- a/src/libudev/log.h
+++ b/src/shared/log.h
diff --git a/src/libudev/macro.h b/src/shared/macro.h
index 2deaf04092..2deaf04092 100644
--- a/src/libudev/macro.h
+++ b/src/shared/macro.h
diff --git a/src/libudev/missing.h b/src/shared/missing.h
index 471a81120c..471a81120c 100644
--- a/src/libudev/missing.h
+++ b/src/shared/missing.h
diff --git a/src/udev/mkdir.c b/src/shared/mkdir.c
index 770ee994c4..770ee994c4 100644
--- a/src/udev/mkdir.c
+++ b/src/shared/mkdir.c
diff --git a/src/udev/mkdir.h b/src/shared/mkdir.h
index 24ffa6364c..24ffa6364c 100644
--- a/src/udev/mkdir.h
+++ b/src/shared/mkdir.h
diff --git a/src/libudev/path-util.c b/src/shared/path-util.c
index 41bc20de69..41bc20de69 100644
--- a/src/libudev/path-util.c
+++ b/src/shared/path-util.c
diff --git a/src/libudev/path-util.h b/src/shared/path-util.h
index 8e55131093..8e55131093 100644
--- a/src/libudev/path-util.h
+++ b/src/shared/path-util.h
diff --git a/src/libudev/set.c b/src/shared/set.c
index 3a4f7d049a..3a4f7d049a 100644
--- a/src/libudev/set.c
+++ b/src/shared/set.c
diff --git a/src/libudev/set.h b/src/shared/set.h
index 76383a423a..76383a423a 100644
--- a/src/libudev/set.h
+++ b/src/shared/set.h
diff --git a/src/libudev/siphash24.c b/src/shared/siphash24.c
index f68bd283a1..f68bd283a1 100644
--- a/src/libudev/siphash24.c
+++ b/src/shared/siphash24.c
diff --git a/src/libudev/siphash24.h b/src/shared/siphash24.h
index 3253c179b6..3253c179b6 100644
--- a/src/libudev/siphash24.h
+++ b/src/shared/siphash24.h
diff --git a/src/udev/smack-util.c b/src/shared/smack-util.c
index 2711041c7e..2711041c7e 100644
--- a/src/udev/smack-util.c
+++ b/src/shared/smack-util.c
diff --git a/src/udev/smack-util.h b/src/shared/smack-util.h
index 88704894e7..88704894e7 100644
--- a/src/udev/smack-util.h
+++ b/src/shared/smack-util.h
diff --git a/src/libudev/socket-util.h b/src/shared/socket-util.h
index 2daa3279fa..2daa3279fa 100644
--- a/src/libudev/socket-util.h
+++ b/src/shared/socket-util.h
diff --git a/src/libudev/sparse-endian.h b/src/shared/sparse-endian.h
index 51694bebb7..51694bebb7 100644
--- a/src/libudev/sparse-endian.h
+++ b/src/shared/sparse-endian.h
diff --git a/src/libudev/strbuf.c b/src/shared/strbuf.c
index 189b01a81a..189b01a81a 100644
--- a/src/libudev/strbuf.c
+++ b/src/shared/strbuf.c
diff --git a/src/libudev/strbuf.h b/src/shared/strbuf.h
index 2347fd4328..2347fd4328 100644
--- a/src/libudev/strbuf.h
+++ b/src/shared/strbuf.h
diff --git a/src/libudev/strv.c b/src/shared/strv.c
index da8ea8a0a6..da8ea8a0a6 100644
--- a/src/libudev/strv.c
+++ b/src/shared/strv.c
diff --git a/src/libudev/strv.h b/src/shared/strv.h
index 4cc918367e..4cc918367e 100644
--- a/src/libudev/strv.h
+++ b/src/shared/strv.h
diff --git a/src/libudev/strxcpyx.c b/src/shared/strxcpyx.c
index 6efa237d4b..6efa237d4b 100644
--- a/src/libudev/strxcpyx.c
+++ b/src/shared/strxcpyx.c
diff --git a/src/libudev/strxcpyx.h b/src/shared/strxcpyx.h
index e3450311df..e3450311df 100644
--- a/src/libudev/strxcpyx.h
+++ b/src/shared/strxcpyx.h
diff --git a/src/libudev/time-util.c b/src/shared/time-util.c
index 6f76e8c19b..6f76e8c19b 100644
--- a/src/libudev/time-util.c
+++ b/src/shared/time-util.c
diff --git a/src/libudev/time-util.h b/src/shared/time-util.h
index 16ef25b523..16ef25b523 100644
--- a/src/libudev/time-util.h
+++ b/src/shared/time-util.h
diff --git a/src/udev/udev-util.h b/src/shared/udev-util.h
index 5f09ce181f..5f09ce181f 100644
--- a/src/udev/udev-util.h
+++ b/src/shared/udev-util.h
diff --git a/src/libudev/utf8.c b/src/shared/utf8.c
index 1044fb6489..1044fb6489 100644
--- a/src/libudev/utf8.c
+++ b/src/shared/utf8.c
diff --git a/src/libudev/utf8.h b/src/shared/utf8.h
index 9d09153c1c..9d09153c1c 100644
--- a/src/libudev/utf8.h
+++ b/src/shared/utf8.h
diff --git a/src/libudev/util.c b/src/shared/util.c
index 5ff767b6a7..5ff767b6a7 100644
--- a/src/libudev/util.c
+++ b/src/shared/util.c
diff --git a/src/libudev/util.h b/src/shared/util.h
index 5e699ca5a8..5e699ca5a8 100644
--- a/src/libudev/util.h
+++ b/src/shared/util.h
diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am
index 8722524e67..638e2d5678 100644
--- a/src/udev/Makefile.am
+++ b/src/udev/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
-DUDEV_RULES_DIR=\"$(udevrulesdir)\" \
-DUDEV_LIBEXEC_DIR=\"$(udevlibexecdir)\" \
-DUDEV_VERSION=\"$(UDEV_VERSION)\" \
+ -I $(top_srcdir)/src/shared \
-I $(top_srcdir)/src/libudev
bin_PROGRAMS = \
@@ -54,24 +55,13 @@ libudev_core_la_SOURCES = \
udev-builtin-input_id.c \
udev-builtin-net_id.c \
udev-builtin-path_id.c \
- udev-builtin-usb_id.c \
- dev-setup.c \
- label.c \
- mkdir.c \
- smack-util.c
+ udev-builtin-usb_id.c
if ENABLE_FIRMWARE
libudev_core_la_SOURCES += \
udev-builtin-firmware.c
endif
-noinst_HEADERS = \
- dev-setup.h \
- label.h \
- mkdir.h \
- smack-util.h \
- udev-util.h
-
include_HEADERS = \
udev.h
@@ -80,6 +70,7 @@ libudev_core_la_CFLAGS = \
$(BLKID_CFLAGS)
libudev_core_la_LIBADD = \
+ $(top_builddir)/src/shared/libudev_shared.la \
$(top_builddir)/src/libudev/libudev-private.la \
$(BLKID_LIBS) \
$(SELINUX_LIBS)
@@ -92,15 +83,12 @@ endif
if HAVE_MODULES
libudev_core_la_SOURCES += \
udev-builtin-kmod.c
-
if HAVE_LIBKMOD
libudev_core_la_CFLAGS += $(KMOD_CFLAGS)
libudev_core_la_LIBADD += $(KMOD_LIBS)
endif
endif
-
-
libudev_core_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
diff --git a/test/Makefile.am b/test/Makefile.am
index f12ee20f04..4b2b431865 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,8 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DVERSION=\"@VERSION@\" \
- -I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/shared \
+ -I $(top_srcdir)/src/libudev
noinst_PROGRAMS = \
test-libudev \