--- include/pathnames.h | 11 +++++++++-- sys-utils/Makemodule.am | 16 ++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/include/pathnames.h b/include/pathnames.h index a30194b10..34ba11ca3 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -187,7 +187,7 @@ #define _PATH_PROC_KERNEL "/proc/sys/kernel" -/* ipc paths */ +/* System V ipc paths */ #define _PATH_PROC_SYSV_MSG "/proc/sysvipc/msg" #define _PATH_PROC_SYSV_SEM "/proc/sysvipc/sem" #define _PATH_PROC_SYSV_SHM "/proc/sysvipc/shm" @@ -208,6 +208,13 @@ #define _PATH_PROC_PIPE_MAX_SIZE _PATH_PROC_SYS_FS "/pipe-max-size" #define _PATH_PROC_BINFMT_MISC _PATH_PROC_SYS_FS "/binfmt_misc" +/* Posix ipc paths */ +#define _PATH_DEV_MQUEUE "/dev/mqueue" +#define _PATH_PROC_POSIX_IPC_MSGMAX _PATH_PROC_SYS_FS "/mqueue/msgsize_max" +#define _PATH_PROC_POSIX_IPC_MSGMNB _PATH_PROC_SYS_FS "/mqueue/msg_max" +#define _PATH_PROC_POSIX_IPC_MSGMNI _PATH_PROC_SYS_FS "/mqueue/queues_max" +#define _PATH_DEV_SHM "/dev/shm" + /* irqtop paths */ #define _PATH_PROC_INTERRUPTS "/proc/interrupts" #define _PATH_PROC_SOFTIRQS "/proc/softirqs" @@ -243,4 +250,4 @@ # define UL_VENDORDIR_PATH NULL #endif -#endif /* PATHNAMES_H */ +#endif /* PATHNAMES_H */ \ No newline at end of file diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 8cc69be60..03955c85c 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -43,8 +43,11 @@ if BUILD_IPCRM usrbin_exec_PROGRAMS += ipcrm MANPAGES += sys-utils/ipcrm.1 dist_noinst_DATA += sys-utils/ipcrm.1.adoc -ipcrm_SOURCES = sys-utils/ipcrm.c -ipcrm_LDADD = $(LDADD) libcommon.la +ipcrm_SOURCES = sys-utils/ipcrm.c \ + sys-utils/ipcutils.c \ + sys-utils/ipcutils.h +ipcrm_LDADD = $(LDADD) libcommon.la libmount.la +ipcrm_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) endif if BUILD_IPCS @@ -54,7 +57,8 @@ dist_noinst_DATA += sys-utils/ipcs.1.adoc ipcs_SOURCES = sys-utils/ipcs.c \ sys-utils/ipcutils.c \ sys-utils/ipcutils.h -ipcs_LDADD = $(LDADD) libcommon.la +ipcs_LDADD = $(LDADD) libcommon.la libmount.la +ipcs_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) endif if BUILD_IRQTOP @@ -93,8 +97,8 @@ dist_noinst_DATA += sys-utils/lsipc.1.adoc lsipc_SOURCES = sys-utils/lsipc.c \ sys-utils/ipcutils.c \ sys-utils/ipcutils.h -lsipc_LDADD = $(LDADD) libcommon.la libsmartcols.la -lsipc_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) +lsipc_LDADD = $(LDADD) libcommon.la libsmartcols.la libmount.la +lsipc_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) -I$(ul_libmount_incdir) endif if BUILD_RENICE @@ -591,4 +595,4 @@ if HAVE_LINUX_LANDLOCK_H setpriv_SOURCES += sys-utils/setpriv-landlock.c endif setpriv_LDADD = $(LDADD) -lcap-ng libcommon.la -endif +endif \ No newline at end of file -- 2.43.0