Makefile: always pass VERBOSE to the make command

[olsrd.git] / Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 19c7d42..9ef9881 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -17,6 +17,15 @@ OPTIMIZE ?=
 # you need a recent enough gcc and the libmudflap installed
 MUDFLAP ?= 0
 
 # you need a recent enough gcc and the libmudflap installed
 MUDFLAP ?= 0
 

+# shows full compiler/linker calls if activated
+VERBOSE ?= 0
+
+ifeq ($(VERBOSE),0)
+MAKECMDPREFIX = @
+else
+MAKECMDPREFIX =
+endif
+

 # OS detection
 ifeq ($(OS),Windows_NT)
 OS := win32
 # OS detection
 ifeq ($(OS),Windows_NT)
 OS := win32


@@ -47,15 +56,21 @@ FLEX ?=             flex
 TAGCMD ?=      etags
 
 # target directories and names
 TAGCMD ?=      etags
 
 # target directories and names

-DESTDIR ?=
-SBINDIR ?= $(DESTDIR)/usr/sbin
-ETCDIR  ?= $(DESTDIR)/etc
-LIBDIR  ?= $(DESTDIR)/usr/lib
-DOCDIR  ?= $(DESTDIR)/usr/share/doc
-MANDIR  ?= $(DESTDIR)/usr/share/man
-EXENAME ?= olsrd
-CFGNAME ?= $(EXENAME).conf
-CFGFILE ?= $(ETCDIR)/$(CFGNAME)
+DESTDIR  ?=
+ETCDIR   ?= $(DESTDIR)/etc
+USRDIR   ?= $(DESTDIR)/usr
+INCLUDEDIR ?= $(DESTDIR)/usr/include
+LIBDIR   ?= $(USRDIR)/lib
+SBINDIR  ?= $(USRDIR)/sbin
+SHAREDIR ?= $(USRDIR)/share
+DOCDIR   ?= $(SHAREDIR)/doc
+MANDIR   ?= $(SHAREDIR)/man
+EXENAME  ?= olsrd
+CFGNAME  ?= $(EXENAME).conf
+CFGFILE  ?= $(ETCDIR)/$(CFGNAME)
+
+DOCDIR_OLSRD ?= $(DOCDIR)/$(EXENAME)
+

 
 CPPFLAGS =     -Isrc
 ifneq ($(TOPDIR),.)
 
 CPPFLAGS =     -Isrc
 ifneq ($(TOPDIR),.)


@@ -84,10 +99,23 @@ WARNINGS += -Wbad-function-cast
 WARNINGS +=    -Wpointer-arith
 WARNINGS +=    -Wcast-qual
 WARNINGS +=    -Wshadow
 WARNINGS +=    -Wpointer-arith
 WARNINGS +=    -Wcast-qual
 WARNINGS +=    -Wshadow

-WARNINGS +=    -Wformat-2
+WARNINGS +=    -Wformat

 WARNINGS +=    -Wsequence-point
 WARNINGS +=    -Wsequence-point

-WARNINGS +=    -Wpointer-arith

 WARNINGS +=    -Wcast-align
 WARNINGS +=    -Wcast-align

+WARNINGS +=    -Wformat-security
+WARNINGS +=    -Wformat-y2k
+WARNINGS +=     -Werror=format-security
+WARNINGS +=    -Winit-self
+WARNINGS +=    -Wswitch-default
+WARNINGS +=    -Wsync-nand
+WARNINGS +=    -Wundef
+WARNINGS +=    -Wlogical-op
+ifneq ($(OS),android)
+WARNINGS +=    -Wdouble-promotion
+WARNINGS +=    -Wjump-misses-init
+WARNINGS +=    -Wtrampolines
+endif
+WARNINGS +=    -Wunused-parameter

 # the following 2 do not work yet and need more work on it
 #WARNINGS +=   -Wconversion
 #WARNINGS +=   -Wredundant-decls
 # the following 2 do not work yet and need more work on it
 #WARNINGS +=   -Wconversion
 #WARNINGS +=   -Wredundant-decls


@@ -99,7 +127,7 @@ endif
 #WARNINGS +=   -Wunreachable-code
 WARNINGS +=    -Winline
 WARNINGS +=    -Wdisabled-optimization
 #WARNINGS +=   -Wunreachable-code
 WARNINGS +=    -Winline
 WARNINGS +=    -Wdisabled-optimization

-#WARNINGS +=   -Werror
+# WARNINGS +=  -Werror

 WARNINGS +=    -finline-functions-called-once
 WARNINGS +=    -funit-at-a-time
 WARNINGS +=    -fearly-inlining
 WARNINGS +=    -finline-functions-called-once
 WARNINGS +=    -funit-at-a-time
 WARNINGS +=    -fearly-inlining


@@ -116,7 +144,7 @@ WARNINGS += -finline-limit=350
 # from the source by hand.
 #WARNINGS +=   -ffunction-sections
 #WARNINGS +=   -fdata-sections
 # from the source by hand.
 #WARNINGS +=   -ffunction-sections
 #WARNINGS +=   -fdata-sections

-WARNINGS :=    $(shell CC="$(CC)" $(TOPDIR)/gcc-warnings $(WARNINGS))
+WARNINGS :=    $(shell CC="$(CC)" "$(TOPDIR)/gcc-warnings" $(WARNINGS))

 endif
 CFLAGS +=      $(WARNINGS)
 CFLAGS +=      $(OPTIMIZE)
 endif
 CFLAGS +=      $(WARNINGS)
 CFLAGS +=      $(OPTIMIZE)


@@ -136,7 +164,7 @@ ifeq ($(OS),win32)
   LDFLAGS +=   -Wl,-export-all-symbols,--enable-auto-import
 endif
 LDFLAGS +=     -shared
   LDFLAGS +=   -Wl,-export-all-symbols,--enable-auto-import
 endif
 LDFLAGS +=     -shared

-LDFLAGS +=     -Wl,-soname,$(PLUGIN_NAME)
+LDFLAGS +=     -Wl,-soname,$(PLUGIN_SONAME)

 LDFLAGS +=     -Wl,--version-script=version-script.txt 
 else
 # c and ld flags for main
 LDFLAGS +=     -Wl,--version-script=version-script.txt 
 else
 # c and ld flags for main


@@ -192,17 +220,30 @@ CPPFLAGS +=       -DDEBUG
 CFLAGS +=      -ggdb
 else
 CPPFLAGS +=    -DNDEBUG
 CFLAGS +=      -ggdb
 else
 CPPFLAGS +=    -DNDEBUG

+ifeq ($(OPTIMIZE),)
+OPTIMIZE += -O2 -D_FORTIFY_SOURCE=2 
+endif

 endif
 ifeq ($(NO_DEBUG_MESSAGES),1)
 CPPFLAGS +=    -DNODEBUG
 endif
 
 endif
 ifeq ($(NO_DEBUG_MESSAGES),1)
 CPPFLAGS +=    -DNODEBUG
 endif
 

+ifeq ($(OS),linux)
+CPPFLAGS+=-DHTTPINFO_PUD -I$(TOPDIR)/lib -I$(TOPDIR)/lib/pud/nmealib/include -I$(TOPDIR)/lib/pud/wireformat/include
+endif
+

 # a make function to quote "/" and "."
 quote = $(subst .,\.,$(subst /,\/,$1))
 
 # fully automatic and working dependency generation
 %.d: %.c
 # a make function to quote "/" and "."
 quote = $(subst .,\.,$(subst /,\/,$1))
 
 # fully automatic and working dependency generation
 %.d: %.c

-       @$(filter-out $(CCACHE),$(CC)) -M $(strip $(CPPFLAGS)) "$<" | sed -e '1s/\($(call quote,$(*F))\.o\)[ :]*/$(call quote,$(*D)/\1 $@: Makefile $(TOPDIR)$(if $(TOPDIR),/)Makefile.inc) /g' >"$@"
+       $(MAKECMDPREFIX)$(filter-out $(CCACHE),$(CC)) -M $(strip $(CPPFLAGS)) "$<" | sed -e '1s/\($(call quote,$(*F))\.o\)[ :]*/$(call quote,$(*D)/\1 $@: Makefile $(TOPDIR)$(if $(TOPDIR),/)Makefile.inc) /g' >"$@"
+
+%.o: %.c
+ifeq ($(VERBOSE),0)
+       @echo "[CC] $<"
+endif
+       $(MAKECMDPREFIX)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<

 
 # we always need the includes and defines
 # for legacy since now
 
 # we always need the includes and defines
 # for legacy since now


@@ -225,12 +266,13 @@ help:
        @echo ' by setting the OS variable! Valid  '
        @echo ' target OSes are:                   '
        @echo ' ---------------------------------  '
        @echo ' by setting the OS variable! Valid  '
        @echo ' target OSes are:                   '
        @echo ' ---------------------------------  '

-       @echo ' linux - GNU/Linux                  '
-       @echo ' win32 - MS Windows                 '
-       @echo ' fbsd  - FreeBSD                    '
-       @echo ' nbsd  - NetBSD                     '
-       @echo ' obsd  - OpenBSD                    '
-       @echo ' osx   - Mac OS X                   '
+       @echo ' linux   - GNU/Linux                '
+       @echo ' win32   - MS Windows               '
+       @echo ' fbsd    - FreeBSD                  '
+       @echo ' nbsd    - NetBSD                   '
+       @echo ' obsd    - OpenBSD                  '
+       @echo ' osx     - Mac OS X                 '
+       @echo ' android - Android                  '

        @echo ' ---------------------------------  '
        @echo ' Example - build for windows:       '
        @echo ' make OS=win32                      '
        @echo ' ---------------------------------  '
        @echo ' Example - build for windows:       '
        @echo ' make OS=win32                      '