Skip to content

Commit

Permalink
build with -fno-common
Browse files Browse the repository at this point in the history
Follow-up to cherry-picking hishamhm#981
  * add -fno-common to AM_CFLAGS
  * move -D and -I options from AM_CFLAGS to AM_CPPFLAGS
  • Loading branch information
aswild committed Apr 9, 2020
1 parent 7f77d12 commit 797c569
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ applications_DATA = htop.desktop
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = htop.png

AM_CFLAGS = -pedantic -Wall $(wextra_flag) $(werror_flag) -Wno-cast-function-type -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"
AM_CFLAGS = -pedantic -Wall $(wextra_flag) $(werror_flag) -Wno-cast-function-type -std=c99 -fno-common
AM_LDFLAGS =
AM_CPPFLAGS = -DNDEBUG
AM_CPPFLAGS = -DNDEBUG -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"

myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c MainPanel.c \
Expand Down

0 comments on commit 797c569

Please sign in to comment.