From 89473cc9ae950bbb5e291d1f186d372f66f66394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Tue, 15 Dec 2020 19:44:48 +0100 Subject: Rework enum ProcessField Use only one enum instead of a global and a platform specific one. Drop Platform_numberOfFields global variable. Set known size of Process_fields array --- Makefile.am | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 09790fa4..80527829 100644 --- a/Makefile.am +++ b/Makefile.am @@ -133,6 +133,7 @@ linux_platform_headers = \ linux/LinuxProcessList.h \ linux/Platform.h \ linux/PressureStallMeter.h \ + linux/ProcessField.h \ linux/SELinuxMeter.h \ linux/SystemdMeter.h \ linux/ZramMeter.h \ @@ -164,9 +165,10 @@ endif # ------- freebsd_platform_headers = \ - freebsd/Platform.h \ freebsd/FreeBSDProcessList.h \ freebsd/FreeBSDProcess.h \ + freebsd/Platform.h \ + freebsd/ProcessField.h \ zfs/ZfsArcMeter.h \ zfs/ZfsCompressedArcMeter.h \ zfs/ZfsArcStats.h \ @@ -184,9 +186,10 @@ endif # ------------ dragonflybsd_platform_headers = \ - dragonflybsd/Platform.h \ dragonflybsd/DragonFlyBSDProcessList.h \ - dragonflybsd/DragonFlyBSDProcess.h + dragonflybsd/DragonFlyBSDProcess.h \ + dragonflybsd/Platform.h \ + dragonflybsd/ProcessField.h if HTOP_DRAGONFLYBSD AM_LDFLAGS += -lkvm -lkinfo @@ -200,9 +203,10 @@ endif # ------- openbsd_platform_headers = \ - openbsd/Platform.h \ openbsd/OpenBSDProcessList.h \ - openbsd/OpenBSDProcess.h + openbsd/OpenBSDProcess.h \ + openbsd/Platform.h \ + openbsd/ProcessField.h if HTOP_OPENBSD myhtopplatsources = openbsd/Platform.c openbsd/OpenBSDProcessList.c \ @@ -215,9 +219,10 @@ endif # ------ darwin_platform_headers = \ - darwin/Platform.h \ darwin/DarwinProcess.h \ darwin/DarwinProcessList.h \ + darwin/Platform.h \ + darwin/ProcessField.h \ zfs/ZfsArcMeter.h \ zfs/ZfsCompressedArcMeter.h \ zfs/ZfsArcStats.h \ @@ -237,6 +242,7 @@ endif solaris_platform_headers = \ solaris/Platform.h \ + solaris/ProcessField.h \ solaris/SolarisProcess.h \ solaris/SolarisProcessList.h \ zfs/ZfsArcMeter.h \ @@ -256,6 +262,7 @@ endif unsupported_platform_headers = \ unsupported/Platform.h \ + unsupported/ProcessField.h \ unsupported/UnsupportedProcess.h \ unsupported/UnsupportedProcessList.h -- cgit v1.2.3