jsoninfo: HTTP headers with CORS (if requested)

[olsrd.git] / Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 0f8c993..52fea38 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
 
+# shows full compiler/linker calls if activated
+VERBOSE ?= 0
+
+ifeq ($(VERBOSE),0)
+MAKECMDPREFIX = @
+else
+MAKECMDPREFIX =
+endif
+
 # OS detection
 ifeq ($(OS),Windows_NT)
 OS := win32
@@ -59,6 +68,7 @@ MANDIR   ?= $(SHAREDIR)/man
 EXENAME  ?= olsrd
 CFGNAME  ?= $(EXENAME).conf
 CFGFILE  ?= $(ETCDIR)/$(CFGNAME)
+SGW_POLICY_SCRIPT ?= sgw_policy_routing_setup.sh
 
 DOCDIR_OLSRD ?= $(DOCDIR)/$(EXENAME)
 
@@ -141,8 +151,6 @@ CFLAGS +=   $(WARNINGS)
 CFLAGS +=      $(OPTIMIZE)
 CFLAGS +=      $(EXTRA_CFLAGS)
 
-# Must be specified along with -lpthread on linux
-CPPFLAGS +=    $(OS_CFLAG_PTHREAD)
 endif
 ifneq ($(MUDFLAP),0)
 CFLAGS +=      -fmudflapth
@@ -175,11 +183,22 @@ LDFLAGS +=        -Wl,--warn-common
 ifneq ($(MUDFLAP),0)
 LIBS +=                -lmudflapth
 endif
-LIBS +=                $(OS_LIB_PTHREAD)
 
 # extra options from the outside
 CPPFLAGS +=    $(EXTRA_CPPFLAGS)
 
+
+# 32/64 cross compilation
+ifdef M32
+CFLAGS +=      -m32
+LDFLAGS +=     -m32
+endif
+ifdef M64
+CFLAGS +=      -m64
+LDFLAGS +=     -m64
+endif
+
+
 ###################################
 #
 # options to save space on small systems
@@ -228,11 +247,13 @@ 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] $<"
-       @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+endif
+       $(MAKECMDPREFIX)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 # we always need the includes and defines
 # for legacy since now