summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--discard.mk7
-rw-r--r--src/libudev/src/Makefile15
3 files changed, 8 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index b4c1285de9..375f80eeb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3655,7 +3655,7 @@ libudev-uninstall-hook:
INSTALL_EXEC_HOOKS += libudev-install-hook
UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
-# ------------------------------------------------------------------------------
+#@src/libudev/src/Makefile -----------------------------------------------------
noinst_LTLIBRARIES += \
libudev-internal.la
diff --git a/discard.mk b/discard.mk
index 3faf228b6c..cedb614140 100644
--- a/discard.mk
+++ b/discard.mk
@@ -738,13 +738,6 @@ libudev-uninstall-hook:
INSTALL_EXEC_HOOKS += libudev-install-hook
UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libudev-internal.la
-
-libudev_internal_la_SOURCES =\
- $(libudev_la_SOURCES)
-
ifneq ($(ENABLE_TESTS),)
TESTS += \
test/udev-test.pl
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 69d6573b5f..99f5c64fda 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -61,6 +61,12 @@ pkgconfiglib_DATA += \
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
@@ -74,16 +80,9 @@ test_libudev_sym_CFLAGS = \
test_libudev_sym_LDADD = \
libudev.la
-noinst_LTLIBRARIES += \
- libudev-internal.la
-
-libudev_internal_la_SOURCES =\
- $(libudev_la_SOURCES)
-
-systemd.sed_files += libudev.pc
-
libudev_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic
systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device
systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb
+systemd.sed_files += libudev.pc
include $(topsrcdir)/build-aux/Makefile.tail.mk