diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | discard.mk | 7 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/Makefile | 16 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/Makefile | 9 | ||||
| -rw-r--r-- | src/libudev/Makefile | 14 | ||||
| -rw-r--r-- | src/libudev/src/Makefile | 13 |
6 files changed, 33 insertions, 32 deletions
diff --git a/Makefile.am b/Makefile.am index 849ef8a73d..9b6b6e3ee2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3669,6 +3669,7 @@ include_HEADERS += \ rootlib_LTLIBRARIES += \ libudev.la +#@src/libudev/src/Makefile libudev_la_SOURCES =\ src/libudev/libudev.sym \ src/libudev/libudev-private.h \ @@ -3682,6 +3683,7 @@ libudev_la_SOURCES =\ src/libudev/libudev-monitor.c \ src/libudev/libudev-queue.c \ src/libudev/libudev-hwdb.c +#@src/libudev/Makefile libudev_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -5213,7 +5215,7 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-machined.service.in -#@src/grp-machine/grp-import/Makefile ------------------------------------------ +# ------------------------------------------------------------------------------ if ENABLE_IMPORTD if HAVE_LIBCURL @@ -5374,7 +5376,7 @@ test_qcow2_LDADD = \ libshared.la \ $(ZLIB_LIBS) -#@src/grp-machine/grp-import/Makefile +#@discard.mk endif # HAVE_GCRYPT endif # HAVE_BZIP2 endif # HAVE_ZLIB diff --git a/discard.mk b/discard.mk index 32dde117ca..068a218d9d 100644 --- a/discard.mk +++ b/discard.mk @@ -685,6 +685,13 @@ test_nss_LDADD = \ manual_tests += \ test-nss +endif # HAVE_GCRYPT +endif # HAVE_BZIP2 +endif # HAVE_ZLIB +endif # HAVE_XZ +endif # HAVE_LIBCURL + +endif # ENABLE_IMPORTD EXTRA_DIST += \ test/Makefile \ test/README.testsuite \ diff --git a/src/grp-machine/grp-import/Makefile b/src/grp-machine/grp-import/Makefile index 5cda3c9a9f..dfa189b317 100644 --- a/src/grp-machine/grp-import/Makefile +++ b/src/grp-machine/grp-import/Makefile @@ -23,22 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -ifneq ($(ENABLE_IMPORTD),) - -ifneq ($(HAVE_LIBCURL),) -ifneq ($(HAVE_XZ),) -ifneq ($(HAVE_ZLIB),) -ifneq ($(HAVE_BZIP2),) -ifneq ($(HAVE_GCRYPT),) - -endif # HAVE_GCRYPT -endif # HAVE_BZIP2 -endif # HAVE_ZLIB -endif # HAVE_XZ -endif # HAVE_LIBCURL - -endif # ENABLE_IMPORTD - nested.subdirs += libimport nested.subdirs += systemd-export nested.subdirs += systemd-import diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile index 664a54d190..ee17bfcd7c 100644 --- a/src/grp-machine/systemd-machined/Makefile +++ b/src/grp-machine/systemd-machined/Makefile @@ -89,4 +89,13 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-machined.service.in +# ------------------------------------------------------------------------------ +ifneq ($(ENABLE_IMPORTD),) + +ifneq ($(HAVE_LIBCURL),) +ifneq ($(HAVE_XZ),) +ifneq ($(HAVE_ZLIB),) +ifneq ($(HAVE_BZIP2),) +ifneq ($(HAVE_GCRYPT),) + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/Makefile b/src/libudev/Makefile index b7c2d74671..3bc64ab8e0 100644 --- a/src/libudev/Makefile +++ b/src/libudev/Makefile @@ -33,20 +33,6 @@ include_HEADERS += \ rootlib_LTLIBRARIES += \ libudev.la -libudev_la_SOURCES =\ - src/libudev/libudev.sym \ - src/libudev/libudev-private.h \ - src/libudev/libudev-device-internal.h \ - src/libudev/libudev.c \ - src/libudev/libudev-list.c \ - src/libudev/libudev-util.c \ - src/libudev/libudev-device.c \ - src/libudev/libudev-device-private.c \ - src/libudev/libudev-enumerate.c \ - src/libudev/libudev-monitor.c \ - src/libudev/libudev-queue.c \ - src/libudev/libudev-hwdb.c - libudev_la_LDFLAGS = \ $(AM_LDFLAGS) \ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 0911f242ee..46f122d52d 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -23,6 +23,19 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +libudev_la_SOURCES =\ + src/libudev/libudev.sym \ + src/libudev/libudev-private.h \ + src/libudev/libudev-device-internal.h \ + src/libudev/libudev.c \ + src/libudev/libudev-list.c \ + src/libudev/libudev-util.c \ + src/libudev/libudev-device.c \ + src/libudev/libudev-device-private.c \ + src/libudev/libudev-enumerate.c \ + src/libudev/libudev-monitor.c \ + src/libudev/libudev-queue.c \ + src/libudev/libudev-hwdb.c noinst_LTLIBRARIES += \ libudev-internal.la |