Merge pull request #6685 from BOINC/dpa_makefiles

update linux Makefiles

Author: AenBleidd

client/Makefile.linux

@@ -8,19 +8,8 @@
 #    make -f Makefile.linux clean all
 # 4) do the same in this dir
 
-OPTS = -O2 -Wall -Wformat -Wformat=2 -Wconversion -Wimplicit-fallthrough \
--Wno-deprecated-copy \
--Werror=format-security \
--U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 \
--D_GLIBCXX_ASSERTIONS \
--fstack-protector -fstack-protector-strong \
--Wl,-z,nodlopen -Wl,-z,noexecstack \
--Wl,-z,relro -Wl,-z,now \
--Wl,--as-needed -Wl,--no-copy-dt-needed-entries
-
 //CC = g++ -O4 -Wall -I ../ -I ../lib/
-//CC = g++ -g -Wall -I ../ -I ../lib/
-CC = g++ -g $(OPTS) -I ../ -I ../lib/
+CC = g++ -g -Wall -I ../ -I ../lib/
 
 PROGS = boinc boinccmd
 
@@ -153,7 +142,7 @@ clean:
 LIBS = ../lib/boinc.a \
     -L /usr/local/lib/ \
     -lpthread \
-    -lX11 -lXss\
+    -lX11 \
     -lcurl -lssl -lcrypto \
     -lz -ldl
 

lib/Makefile.linux

@@ -1,19 +1,8 @@
 # make libraries for Linux client and boinccmd
 
-OPTS = -O2 -Wall -Wformat -Wformat=2 -Wconversion -Wimplicit-fallthrough \
--Wno-deprecated-copy \
--Werror=format-security \
--U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 \
--D_GLIBCXX_ASSERTIONS \
-# -fstack-clash-protection \
--fstack-protector-strong \
--Wl,-z,nodlopen -Wl,-z,noexecstack \
--Wl,-z,relro -Wl,-z,now \
--Wl,--as-needed -Wl,--no-copy-dt-needed-entries
-
 //CC = g++ -O4 -Wall -I ../
-//CC = g++ -g -Wall -I ../
-CC = g++ -g $(OPTS) -I ../
+CC = g++ -g -Wall -I ../ \
+-Wall -Wextra -pedantic -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wnoexcept -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wno-unused -Wno-variadic-macros -Wno-parentheses -fdiagnostics-show-option
 
 all: boinc.a boinc_cmd.a