build-sys: exclude GPL from libcommon

The library is not distributed and almost all code in this ar(1)
archive is Public Domain or LGPL ... but let's avoid any doubts and do
not mix non-GPL and GPL code there.

Addresses: https://github.com/karelzak/util-linux/issues/1157
Signed-off-by: Karel Zak <kzak@redhat.com>

disk-utils/Makemodule.am

@@ -4,14 +4,16 @@ sbin_PROGRAMS += fsck.minix
 dist_man_MANS += disk-utils/fsck.minix.8
 fsck_minix_SOURCES = \
 	disk-utils/fsck.minix.c \
-	disk-utils/minix_programs.h
+	disk-utils/minix_programs.h \
+	lib/ismounted.c
 fsck_minix_LDADD = $(LDADD) libcommon.la
 
 sbin_PROGRAMS += mkfs.minix
 dist_man_MANS += disk-utils/mkfs.minix.8
 mkfs_minix_SOURCES = \
 	disk-utils/minix_programs.h \
-	disk-utils/mkfs.minix.c
+	disk-utils/mkfs.minix.c \
+	lib/ismounted.c
 mkfs_minix_LDADD = $(LDADD) libcommon.la
 
 check_PROGRAMS += test_mkfs_minix
@@ -49,7 +51,8 @@ if BUILD_MKSWAP
 sbin_PROGRAMS += mkswap
 dist_man_MANS += disk-utils/mkswap.8
 mkswap_SOURCES = \
-	disk-utils/mkswap.c
+	disk-utils/mkswap.c \
+	lib/ismounted.c
 mkswap_LDADD = $(LDADD) libcommon.la
 
 mkswap_CFLAGS = $(AM_CFLAGS)

lib/Makemodule.am

@@ -1,4 +1,14 @@
-
+#
+# Use only LGPL or Public domain (preferred) code in libcommon, otherwise add
+# your lib/file.c directly to the _SOURCES= of the target binary.
+#
+# THIS LIBRARY IS NOT DISTRIBUTED!
+#
+# It's just ar(1) archive used by build-system to keep things simple.
+#
+# Note that you need "make install-strip" (or proper rpm / Debian build)
+# to generate binaries with only relevant stuff.
+#
 noinst_LTLIBRARIES += libcommon.la
 libcommon_la_CFLAGS = $(AM_CFLAGS)
 libcommon_la_SOURCES = \
@@ -11,7 +21,6 @@ libcommon_la_SOURCES = \
 	lib/idcache.c \
 	lib/encode.c \
 	lib/fileutils.c \
-	lib/ismounted.c \
 	lib/color-names.c \
 	lib/mangle.c \
 	lib/match.c \
@@ -19,28 +28,23 @@ libcommon_la_SOURCES = \
 	lib/mbsedit.c\
 	lib/md5.c \
 	lib/pager.c \
+	lib/procutils.c \
 	lib/pwdutils.c \
 	lib/randutils.c \
 	lib/setproctitle.c \
 	lib/strutils.c \
 	lib/timeutils.c \
 	lib/ttyutils.c \
-	lib/exec_shell.c \
 	lib/strv.c \
 	lib/sha1.c \
 	lib/signames.c
 
 if LINUX
 libcommon_la_SOURCES += \
-	lib/caputils.c \
 	lib/linux_version.c \
 	lib/loopdev.c
 endif
 
-if USE_PLYMOUTH_SUPPORT
-libcommon_la_SOURCES += lib/plymouth-ctrl.c
-endif
-
 if !HAVE_LANGINFO_H
 libcommon_la_SOURCES += lib/langinfo.c
 endif
@@ -52,7 +56,6 @@ endif
 if HAVE_OPENAT
 if HAVE_DIRFD
 libcommon_la_SOURCES += lib/path.c
-libcommon_la_SOURCES += lib/procutils.c
 libcommon_la_SOURCES += lib/sysfs.c
 endif
 endif

login-utils/Makemodule.am

@@ -31,7 +31,8 @@ dist_man_MANS += login-utils/sulogin.8
 sulogin_SOURCES = \
 	login-utils/sulogin.c \
 	login-utils/sulogin-consoles.c \
-	login-utils/sulogin-consoles.h
+	login-utils/sulogin-consoles.h \
+	lib/plymouth-ctrl.c
 sulogin_LDADD = $(LDADD) libcommon.la
 
 if HAVE_LIBCRYPT

misc-utils/Makemodule.am

@@ -136,7 +136,8 @@ PATHFILES += \
 if BUILD_BLKID
 sbin_PROGRAMS += blkid
 dist_man_MANS += misc-utils/blkid.8
-blkid_SOURCES = misc-utils/blkid.c
+blkid_SOURCES = misc-utils/blkid.c \
+		lib/ismounted.c
 blkid_LDADD = $(LDADD) libblkid.la libcommon.la
 blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 

sys-utils/Makemodule.am

@@ -276,7 +276,8 @@ endif # BUILD_LOSETUP
 if BUILD_ZRAMCTL
 sbin_PROGRAMS += zramctl
 dist_man_MANS += sys-utils/zramctl.8
-zramctl_SOURCES = sys-utils/zramctl.c
+zramctl_SOURCES = sys-utils/zramctl.c \
+		  lib/ismounted.c
 zramctl_LDADD = $(LDADD) libcommon.la libsmartcols.la
 zramctl_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
 endif
@@ -444,7 +445,9 @@ endif
 if BUILD_UNSHARE
 usrbin_exec_PROGRAMS += unshare
 dist_man_MANS += sys-utils/unshare.1
-unshare_SOURCES = sys-utils/unshare.c
+unshare_SOURCES = sys-utils/unshare.c \
+		  lib/caputils.c \
+		  lib/exec_shell.c
 unshare_LDADD = $(LDADD) libcommon.la
 unshare_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
 
@@ -460,7 +463,7 @@ endif
 if BUILD_NSENTER
 usrbin_exec_PROGRAMS += nsenter
 dist_man_MANS += sys-utils/nsenter.1
-nsenter_SOURCES = sys-utils/nsenter.c
+nsenter_SOURCES = sys-utils/nsenter.c lib/exec_shell.c
 nsenter_LDADD = $(LDADD) libcommon.la $(SELINUX_LIBS)
 
 if HAVE_STATIC_NSENTER
@@ -504,6 +507,7 @@ endif # BUILD_HWCLOCK
 if BUILD_SETPRIV
 usrbin_exec_PROGRAMS += setpriv
 dist_man_MANS += sys-utils/setpriv.1
-setpriv_SOURCES = sys-utils/setpriv.c
+setpriv_SOURCES = sys-utils/setpriv.c \
+		  lib/caputils.c
 setpriv_LDADD = $(LDADD) -lcap-ng libcommon.la
 endif

term-utils/Makemodule.am

@@ -42,7 +42,8 @@ endif # BUILD_SCRIPTLIVE
 if BUILD_AGETTY
 sbin_PROGRAMS += agetty
 dist_man_MANS += term-utils/agetty.8
-agetty_SOURCES = term-utils/agetty.c
+agetty_SOURCES = term-utils/agetty.c \
+		 lib/plymouth-ctrl.c
 agetty_LDADD = $(LDADD) libcommon.la
 if BSD
 agetty_LDADD += -lutil