summaryrefslogtreecommitdiff
path: root/src/libudev
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-08-02 12:17:53 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-08-02 12:17:53 -0400
commite907d750b8e99c9a4dad6bc291f04ff9abaf1d0f (patch)
treee83aa9cebde4e35a7ee61d0f3e7e0608bc54d812 /src/libudev
parent272b48187cee0b42b6e936ad2c045f13b391f3ad (diff)
fix
Diffstat (limited to 'src/libudev')
-rw-r--r--src/libudev/.gitignore (renamed from src/libudev/src/.gitignore)0
-rw-r--r--src/libudev/Makefile36
-rw-r--r--src/libudev/libudev.pc.in (renamed from src/libudev/src/libudev.pc.in)0
-rw-r--r--src/libudev/libudev.sym (renamed from src/libudev/src/libudev.sym)0
-rw-r--r--src/libudev/src/Makefile43
5 files changed, 38 insertions, 41 deletions
diff --git a/src/libudev/src/.gitignore b/src/libudev/.gitignore
index 0c8a5d5231..0c8a5d5231 100644
--- a/src/libudev/src/.gitignore
+++ b/src/libudev/.gitignore
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
index 8d9fecb1fb..05e622117e 100644
--- a/src/libudev/Makefile
+++ b/src/libudev/Makefile
@@ -23,6 +23,42 @@
include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
+LIBUDEV_CURRENT=7
+LIBUDEV_REVISION=4
+LIBUDEV_AGE=6
+
+include_HEADERS += \
+ src/libudev/libudev.h
+
+rootlib_LTLIBRARIES += \
+ libudev.la
+
+libudev_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
+ -Wl,--version-script=$(srcdir)/libudev.sym
+
+pkgconfiglib_DATA += \
+ src/libudev/libudev.pc
+
+EXTRA_DIST += \
+ src/libudev/libudev.pc.in
+
+$(outdir)/test-libudev-sym.c: \
+ $(srcdir)/libudev.sym \
+ $(srcdir)/udev.h
+ $(generate-sym-test)
+
+nodist_test_libudev_sym_SOURCES = \
+ test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+ $(AM_CFLAGS) \
+ -Wno-deprecated-declarations
+test_libudev_sym_LDADD = \
+ libudev.la
+
+systemd.sed_files += libudev.pc
+
at.subdirs += src
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/libudev.pc.in b/src/libudev/libudev.pc.in
index a0f3f524e0..a0f3f524e0 100644
--- a/src/libudev/src/libudev.pc.in
+++ b/src/libudev/libudev.pc.in
diff --git a/src/libudev/src/libudev.sym b/src/libudev/libudev.sym
index 76726fca77..76726fca77 100644
--- a/src/libudev/src/libudev.sym
+++ b/src/libudev/libudev.sym
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 2bc5227cfb..3f2f59ed39 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -23,17 +23,7 @@
include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
-LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=4
-LIBUDEV_AGE=6
-
-include_HEADERS += \
- src/libudev/libudev.h
-
-rootlib_LTLIBRARIES += \
- libudev.la
-
-libudev_la_SOURCES =\
+libudev_internal_la_SOURCES =\
src/libudev/libudev.sym \
src/libudev/libudev-private.h \
src/libudev/libudev-device-internal.h \
@@ -47,39 +37,10 @@ libudev_la_SOURCES =\
src/libudev/libudev-queue.c \
src/libudev/libudev-hwdb.c
-libudev_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
- -Wl,--version-script=$(srcdir)/libudev.sym
-
-libudev_la_LIBADD = \
+libudev_internal_la_LIBADD = \
libsystemd-internal.la
-pkgconfiglib_DATA += \
- src/libudev/libudev.pc
-
-EXTRA_DIST += \
- src/libudev/libudev.pc.in
-
noinst_LTLIBRARIES += \
libudev-internal.la
-libudev_internal_la_SOURCES =\
- $(libudev_la_SOURCES)
-
-$(outdir)/test-libudev-sym.c: \
- $(srcdir)/libudev.sym \
- $(srcdir)/udev.h
- $(generate-sym-test)
-
-nodist_test_libudev_sym_SOURCES = \
- test-libudev-sym.c
-test_libudev_sym_CFLAGS = \
- $(AM_CFLAGS) \
- -Wno-deprecated-declarations
-test_libudev_sym_LDADD = \
- libudev.la
-
-systemd.sed_files += libudev.pc
-
include $(topsrcdir)/build-aux/Makefile.tail.mk