diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2014-11-27 19:41:31 -0200 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2014-11-27 19:41:31 -0200 |
| commit | 1dd165c14bf71a6f55abdea2fdc19b54efc03780 (patch) | |
| tree | 6fccfd90301c5d18b931b61db617b8b60ffb0d15 /Makefile.am | |
| parent | a9f05c2a8bc259a6da0be4004d28c75a9cfe7838 (diff) | |
| parent | ca03094bb2d60c6ee1558bd2bcfb9038244b38cb (diff) | |
Merge branch 'master' into freebsd
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 60d50982..15e8e1f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c \ DisplayOptionsPanel.c FunctionBar.c Hashtable.c Header.c htop.c ListItem.c \ LoadAverageMeter.c MemoryMeter.c Meter.c MetersPanel.c Object.c Panel.c \ BatteryMeter.c Process.c ProcessList.c RichString.c ScreenManager.c Settings.c \ -SignalsPanel.c String.c SwapMeter.c TasksMeter.c TraceScreen.c \ +SignalsPanel.c String.c SwapMeter.c TasksMeter.c UptimeMeter.c TraceScreen.c \ UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \ HostnameMeter.c OpenFilesScreen.c Affinity.c IncSet.c Action.c @@ -30,17 +30,15 @@ CPUMeter.h CRT.h DisplayOptionsPanel.h FunctionBar.h \ Hashtable.h Header.h htop.h ListItem.h LoadAverageMeter.h MemoryMeter.h \ BatteryMeter.h Meter.h MetersPanel.h Object.h Panel.h ProcessList.h RichString.h \ ScreenManager.h Settings.h SignalsPanel.h String.h SwapMeter.h TasksMeter.h \ -TraceScreen.h UsersTable.h Vector.h Process.h AffinityPanel.h \ +UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h AffinityPanel.h \ HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h if HTOP_LINUX myhtopplatsources = linux/Platform.c linux/IOPriorityPanel.c linux/IOPriority.c \ -linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c \ -linux/UptimeMeter.c +linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c myhtopplatheaders = linux/Platform.h linux/IOPriorityPanel.h linux/IOPriority.h \ -linux/LinuxProcess.h linux/LinuxProcessList.h linux/LinuxCRT.h \ -linux/UptimeMeter.h +linux/LinuxProcess.h linux/LinuxProcessList.h linux/LinuxCRT.h endif if HTOP_FREEBSD |