diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 14:47:42 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 14:47:42 -0400 |
| commit | 2fb6771cd954cc939aefa28b48e6c7a3ef0f5687 (patch) | |
| tree | 196fecaa3979075df05239fe342ac260af23d9eb | |
| parent | b9f0fd85e4272009427ea233ffc88dae3ee881b2 (diff) | |
| parent | eae97e4b12f3b56fdcea21e1da1dbd7df396596a (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/libudev/src/Makefile
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | discard.mk | 7 | ||||
| -rw-r--r-- | src/libudev/src/Makefile | 15 |
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 |