X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=misc-utils%2FMakemodule.am;h=f56a819ac0d2928a3e4067364ee2eb0680edccfb;hb=HEAD;hp=e794d8cb1202433773db509e1ada01263fd2af9b;hpb=661a7c364ca75330fbd8b585e5f4efefcc52ed3a;p=thirdparty%2Futil-linux.git

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index e794d8cb12..7f5695a9e9 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -1,3 +1,10 @@
+errnos.h: $(top_srcdir)/tools/all_errnos
+	@echo '  GEN      $@'
+	@$(top_srcdir)/tools/all_errnos "$(SED)" $(CC) $(CFLAGS)
+
+-include errnos.h.deps
+CLEANFILES += errnos.h errnos.h.deps
+
 if BUILD_CAL
 usrbin_exec_PROGRAMS += cal
 MANPAGES += misc-utils/cal.1
@@ -92,13 +99,28 @@ lsblk_SOURCES = \
 	misc-utils/lsblk-properties.c \
 	misc-utils/lsblk-devtree.c \
 	misc-utils/lsblk.h
-lsblk_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la libsmartcols.la
+lsblk_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la \
+		libsmartcols.la libtcolors.la
 lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir) -I$(ul_libsmartcols_incdir)
 if HAVE_UDEV
 lsblk_LDADD += -ludev
 endif
 endif # BUILD_LSBLK
 
+if BUILD_LIBLASTLOG2
+usrbin_exec_PROGRAMS += lastlog2
+MANPAGES += misc-utils/lastlog2.8
+dist_noinst_DATA += misc-utils/lastlog2.8.adoc
+lastlog2_SOURCES = misc-utils/lastlog2.c lib/strutils.c
+lastlog2_LDADD = $(LDADD) liblastlog2.la -lsqlite3
+lastlog2_CFLAGS = $(AM_CFLAGS) -I$(ul_liblastlog2_incdir)
+systemdsystemunit_DATA += \
+	misc-utils/lastlog2-import.service
+tmpfiles_DATA += misc-utils/lastlog2-tmpfiles.conf
+endif
+PATHFILES += misc-utils/lastlog2-import.service \
+             misc-utils/lastlog2-tmpfiles.conf
+
 if BUILD_UUIDGEN
 usrbin_exec_PROGRAMS += uuidgen
 MANPAGES += misc-utils/uuidgen.1
@@ -128,6 +150,7 @@ uuidd_SOURCES = misc-utils/uuidd.c lib/monotonic.c lib/timer.c
 if HAVE_SYSTEMD
 uuidd_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS)
 uuidd_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
+tmpfiles_DATA += misc-utils/uuidd-tmpfiles.conf
 systemdsystemunit_DATA += \
 	misc-utils/uuidd.service \
 	misc-utils/uuidd.socket
@@ -142,7 +165,8 @@ endif # BUILD_UUIDD
 PATHFILES += \
 	misc-utils/uuidd.rc \
 	misc-utils/uuidd.service \
-	misc-utils/uuidd.socket
+	misc-utils/uuidd.socket \
+	misc-utils/uuidd-tmpfiles.conf
 
 if BUILD_BLKID
 sbin_PROGRAMS += blkid
@@ -229,6 +253,15 @@ dist_getoptexample_DATA = \
 	misc-utils/getopt-example.tcsh
 endif
 
+if BUILD_EXCH
+usrbin_exec_PROGRAMS += exch
+MANPAGES += misc-utils/exch.1
+dist_noinst_DATA += misc-utils/exch.1.adoc
+exch_SOURCES = misc-utils/exch.c
+exch_LDADD = $(LDADD) libcommon.la
+exch_CFLAGS = $(AM_CFLAGS)
+endif
+
 if BUILD_FINCORE
 usrbin_exec_PROGRAMS += fincore
 MANPAGES += misc-utils/fincore.1
@@ -247,30 +280,6 @@ hardlink_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
 hardlink_CFLAGS = $(AM_CFLAGS)
 endif
 
-if BUILD_LSFD
-bin_PROGRAMS += lsfd
-MANPAGES += misc-utils/lsfd.1
-dist_noinst_DATA += misc-utils/lsfd.1.adoc
-lsfd_SOURCES = \
-	misc-utils/lsfd.c \
-	misc-utils/lsfd.h \
-	misc-utils/lsfd-filter.h \
-	misc-utils/lsfd-filter.c \
-	misc-utils/lsfd-counter.h \
-	misc-utils/lsfd-counter.c \
-	misc-utils/lsfd-decode-file-flags.c \
-	misc-utils/lsfd-file.c \
-	misc-utils/lsfd-cdev.c \
-	misc-utils/lsfd-bdev.c \
-	misc-utils/lsfd-sock.c \
-	misc-utils/lsfd-sock.h \
-	misc-utils/lsfd-sock-xinfo.c \
-	misc-utils/lsfd-unkn.c \
-	misc-utils/lsfd-fifo.c
-lsfd_LDADD = $(LDADD) $(MQ_LIBS) libsmartcols.la libcommon.la
-lsfd_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
-endif
-
 if BUILD_PIPESZ
 bin_PROGRAMS += pipesz
 MANPAGES += misc-utils/pipesz.1
@@ -300,11 +309,11 @@ endif
 
 if BUILD_ENOSYS
 
-misc-utils/enosys.c: syscalls.h
+misc-utils/enosys.c: syscalls.h errnos.h
 
 syscalls.h: $(top_srcdir)/tools/all_syscalls
 	@echo '  GEN      $@'
-	@$(top_srcdir)/tools/all_syscalls $(CC) $(CFLAGS)
+	@$(top_srcdir)/tools/all_syscalls "$(SED)" $(CC) $(CFLAGS)
 
 -include syscalls.h.deps
 CLEANFILES += syscalls.h syscalls.h.deps
@@ -320,6 +329,7 @@ endif
 if BUILD_LSCLOCKS
 usrbin_exec_PROGRAMS += lsclocks
 MANPAGES += misc-utils/lsclocks.1
+dist_noinst_DATA += misc-utils/lsclocks.1.adoc
 lsclocks_SOURCES = misc-utils/lsclocks.c
 lsclocks_LDADD = $(LDADD) libcommon.la libsmartcols.la
 lsclocks_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)