diff options
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | shlibs/Makefile.am | 13 |
3 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index f332510a3..c489665f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,26 @@ include $(top_srcdir)/config/include-Makefile.am +SHLIBS_DIRS = + +if BUILD_LIBUUID +SHLIBS_DIRS += shlibs/uuid +endif + +if BUILD_LIBBLKID +SHLIBS_DIRS += shlibs/blkid +endif + +if BUILD_LIBMOUNT +SHLIBS_DIRS += shlibs/mount +endif + SUBDIRS = \ include \ disk-utils \ fdisk \ getopt \ lib \ - shlibs \ + $(SHLIBS_DIRS) \ login-utils \ misc-utils \ po \ diff --git a/configure.ac b/configure.ac index 1d81f2074..eaa5945f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1168,7 +1168,6 @@ shlibs/uuid/uuid.pc shlibs/uuid/Makefile shlibs/uuid/man/Makefile shlibs/uuid/src/Makefile -shlibs/Makefile sys-utils/Makefile tests/commands.sh tests/helpers/Makefile diff --git a/shlibs/Makefile.am b/shlibs/Makefile.am deleted file mode 100644 index 84c0cefc8..000000000 --- a/shlibs/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -SUBDIRS = - -if BUILD_LIBUUID -SUBDIRS += uuid -endif - -if BUILD_LIBBLKID -SUBDIRS += blkid -endif - -if BUILD_LIBMOUNT -SUBDIRS += mount -endif |