diff options
| author | David Hunt <dhunt@iolanthe.attlocal.net> | 2015-08-19 13:43:20 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-08-19 13:45:20 -0300 |
| commit | 5e602f18d5f619f7dba6d9fccefacdb991db391d (patch) | |
| tree | d72cbc763c7dcd27022b223f1daf6dcb5ac8bcb6 /Makefile.am | |
| parent | f2c053a88497f3ad5ae786c16ecf1275212c13be (diff) | |
Rename String to StringUtils.
Fixes building on case-insensitive filesystems where String.h gets confused with <string.h>.
From d734dacea0a10d0465dad4e95b3421511e7da112 Mon Sep 17 00:00:00 2001
From: David Hunt <dhunt@iolanthe.attlocal.net>
Date: Sat, 11 Jul 2015 20:56:31 -0500
Subject: [PATCH 1/8] Rename String to StringUtils
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index d47f755a..46377fc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ applications_DATA = htop.desktop pixmapdir = $(datadir)/pixmaps pixmap_DATA = htop.png -htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(my_htop_platform)" +htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)" AM_CPPFLAGS = -DNDEBUG myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \ @@ -20,8 +20,8 @@ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c MainPanel.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 UptimeMeter.c TraceScreen.c \ -UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \ +SignalsPanel.c StringUtils.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 myhtopheaders = AvailableColumnsPanel.h AvailableMetersPanel.h \ @@ -29,9 +29,9 @@ CategoriesPanel.h CheckItem.h ClockMeter.h ColorsPanel.h ColumnsPanel.h \ CPUMeter.h CRT.h MainPanel.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 \ -UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h AffinityPanel.h \ -HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h +ScreenManager.h Settings.h SignalsPanel.h StringUtils.h SwapMeter.h \ +TasksMeter.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 htop_CFLAGS += -rdynamic |