Browse files

1.53: Updated Makefile

  • Loading branch information...
1 parent c921c82 commit 2e492eb835092e7981d10ccec826e13fa7d45ac2 @danmar committed Feb 11, 2012
Showing with 2 additions and 31 deletions.
  1. +2 −31 Makefile
View
33 Makefile
@@ -5,37 +5,8 @@ ifndef HAVE_RULES
HAVE_RULES=no
endif
-ifndef COMSPEC
@kimmov
kimmov added a note Feb 11, 2012

Why was this OS detection lost?

iirc all that detection is used only for the definition of 'CPPCHK_GLIBCXX_DEBUG', so it's redundant in release mode.

@kimmov
kimmov added a note Feb 11, 2012

Oh, right. It would be good if there was a comment that all that logic is just for enabling some debugging flags.

@danmar
Owner
danmar added a note Feb 12, 2012

Yes I thought it looked strange too at first. I'll add this code as "dummy code" in release mode. So there won't be this strange diff between release and debug Makefiles.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
- ifdef ComSpec
- #### ComSpec is defined on some WIN32's.
- COMSPEC=$(ComSpec)
- endif # ComSpec
-endif # COMSPEC
-
-ifdef COMSPEC
- #### Maybe Windows
- ifndef CPPCHK_GLIBCXX_DEBUG
- CPPCHK_GLIBCXX_DEBUG=
- endif # !CPPCHK_GLIBCXX_DEBUG
-else # !COMSPEC
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-
- ifeq ($(uname_S),Linux)
- ifndef CPPCHK_GLIBCXX_DEBUG
- CPPCHK_GLIBCXX_DEBUG=-D_GLIBCXX_DEBUG
- endif # !CPPCHK_GLIBCXX_DEBUG
- endif # Linux
-
- ifeq ($(uname_S),GNU/kFreeBSD)
- ifndef CPPCHK_GLIBCXX_DEBUG
- CPPCHK_GLIBCXX_DEBUG=-D_GLIBCXX_DEBUG
- endif # !CPPCHK_GLIBCXX_DEBUG
- endif # GNU/kFreeBSD
-
-endif # COMSPEC
-
ifndef CXXFLAGS
- CXXFLAGS=-pedantic -Wall -Wextra -Wabi -Wcast-qual -Wfloat-equal -Winline -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Woverloaded-virtual -Wpacked -Wredundant-decls -Wshadow -Wsign-promo $(CPPCHK_GLIBCXX_DEBUG) -g
+ CXXFLAGS=-O2 -DNDEBUG -Wall
endif
ifeq ($(HAVE_RULES),yes)
@@ -266,7 +237,7 @@ lib/cppcheck.o: lib/cppcheck.cpp lib/cppcheck.h lib/settings.h lib/suppressions.
lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/suppressions.h lib/path.h lib/cppcheck.h lib/settings.h lib/standards.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o lib/errorlogger.o lib/errorlogger.cpp
-lib/executionpath.o: lib/executionpath.cpp lib/executionpath.h lib/token.h
+lib/executionpath.o: lib/executionpath.cpp lib/executionpath.h lib/token.h lib/symboldatabase.h lib/mathlib.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o lib/executionpath.o lib/executionpath.cpp
lib/mathlib.o: lib/mathlib.cpp lib/mathlib.h lib/errorlogger.h lib/suppressions.h

0 comments on commit 2e492eb

Please sign in to comment.