aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorEugene V. Lyubimkin <jackyf@debian.org>2011-11-26 15:58:33 +0200
committerDaniel Lange <DLange@git.local>2016-04-11 13:00:30 +0200
commitc65eb8be811f59b55d64d9e7654c33708de79ad9 (patch)
treeee6e542b988263c49f0e1200d6aa5aa635667fe8 /Makefile.am
parent38174fffd79f54a8be7642bf170a2320b29e8063 (diff)
parenteaf11cc12a1aa4b050a8a1e7ea3770d3d9c81e95 (diff)
downloaddebian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.tar.gz
debian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.tar.bz2
debian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.zip
Imported Debian patch 1.0-1debian/1.0-1
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am24
1 files changed, 9 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index 9bf73e4..b648969 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,5 @@
-if HAVE_PLPA
-SUBDIRS = plpa-1.3.2
-endif
-
-ACLOCAL_AMFLAGS=-I m4
+ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = htop
dist_man_MANS = htop.1
@@ -14,7 +10,8 @@ applications_DATA = htop.desktop
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = htop.png
-htop_CFLAGS = -pedantic -Wall -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED
+htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED
+AM_CFLAGS =
AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
@@ -22,26 +19,23 @@ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c DebugMemory.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 \
-SignalItem.c SignalsPanel.c String.c SwapMeter.c TasksMeter.c TraceScreen.c \
+SignalsPanel.c String.c SwapMeter.c TasksMeter.c TraceScreen.c \
UptimeMeter.c UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \
-HostnameMeter.c OpenFilesScreen.c
+HostnameMeter.c OpenFilesScreen.c Affinity.c
myhtopheaders = AvailableColumnsPanel.h AvailableMetersPanel.h \
CategoriesPanel.h CheckItem.h ClockMeter.h ColorsPanel.h ColumnsPanel.h \
CPUMeter.h CRT.h DebugMemory.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 SignalItem.h SignalsPanel.h String.h \
+ScreenManager.h Settings.h SignalsPanel.h String.h \
SwapMeter.h TasksMeter.h TraceScreen.h UptimeMeter.h UsersTable.h Vector.h \
-Process.h AffinityPanel.h HostnameMeter.h OpenFilesScreen.h
+Process.h AffinityPanel.h HostnameMeter.h OpenFilesScreen.h Affinity.h
SUFFIXES = .h
BUILT_SOURCES = $(myhtopheaders)
htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h
-if HAVE_PLPA
-htop_LDADD = $(top_builddir)/plpa-1.3.2/src/libplpa/libplpa_included.la
-endif
profile:
$(MAKE) all CFLAGS="-pg -O2"
@@ -58,5 +52,5 @@ debuglite:
.c.h:
scripts/MakeHeader.py $<
-
-
+cppcheck:
+ cppcheck -q -v . --enable=all -ihwloc-1.2.1 -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS

© 2014-2024 Faster IT GmbH | imprint | privacy policy