Further simplify Makefile

No functional change.

diff --git a/src/Makefile b/src/Makefile
index 291775a94f4b136df0bfd6e63d214af72574c97c..04418cdc51f9d33ae57327edc0e476194732f712 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -170,28 +170,37 @@ endif
 ### ==========================================================================
 
 ### 3.1 Selecting compiler (default = gcc)
 ### ==========================================================================
 
 ### 3.1 Selecting compiler (default = gcc)

+
+CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS)
+LDFLAGS += $(EXTRALDFLAGS)
+

 ifeq ($(COMP),)
        COMP=gcc
 endif
 
 ifeq ($(COMP),)
        COMP=gcc
 endif
 

-ifeq ($(COMP),mingw)
-       comp=mingw
+ifeq ($(COMP),gcc)
+       comp=gcc

        CXX=g++
        CXX=g++

+       CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow

 endif
 
 endif
 

-ifeq ($(COMP),gcc)
-       comp=gcc
+ifeq ($(COMP),mingw)
+       comp=mingw

        CXX=g++
        CXX=g++

+       CXXFLAGS += -Wextra -Wshadow
+       LDFLAGS += -static-libstdc++ -static-libgcc

 endif
 
 ifeq ($(COMP),icc)
        comp=icc
        CXX=icpc
 endif
 
 ifeq ($(COMP),icc)
        comp=icc
        CXX=icpc

+       CXXFLAGS += -diag-disable 1476,10120 -Wcheck -Wabi -Wdeprecated -strict-ansi

 endif
 
 ifeq ($(COMP),clang)
        comp=clang
        CXX=clang++
 endif
 
 ifeq ($(COMP),clang)
        comp=clang
        CXX=clang++

+       CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow

 endif
 
 ifeq ($(comp),icc)
 endif
 
 ifeq ($(comp),icc)


@@ -206,27 +215,6 @@ else
        profile_clean = gcc-profile-clean
 endif
 
        profile_clean = gcc-profile-clean
 endif
 

-### 3.2 General compiler and linker settings
-CXXFLAGS = -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS)
-LDFLAGS += $(EXTRALDFLAGS)
-
-ifeq ($(comp),gcc)
-       CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow
-endif
-
-ifeq ($(comp),mingw)
-       CXXFLAGS += -Wextra -Wshadow
-       LDFLAGS += -static-libstdc++ -static-libgcc
-endif
-
-ifeq ($(comp),icc)
-       CXXFLAGS += -diag-disable 1476,10120 -Wcheck -Wabi -Wdeprecated -strict-ansi
-endif
-
-ifeq ($(comp),clang)
-       CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow
-endif
-

 ifeq ($(os),osx)
        CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6
        LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6
 ifeq ($(os),osx)
        CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6
        LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6