gui: linux: use toplevel make options

But disable some warnings for now.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>

diff --git a/gui/linux-gtk/Makefile b/gui/linux-gtk/Makefile
index eec54da..159f822 100644 (file)
--- a/gui/linux-gtk/Makefile
+++ b/gui/linux-gtk/Makefile
@@ -1,23 +1,20 @@
-CC ?=  gcc
+TOPDIR ?= ../..
+include $(TOPDIR)/Makefile.inc
 
-# shows full compiler/linker calls if activated
-VERBOSE ?= 0
+# hardening flags: -fPIE -Wl,-z,now -pie
+CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -fPIE -Wno-strict-prototypes \
+          -Wno-missing-prototypes -Wno-old-style-definition \
+          -Wno-unused-parameter -Wno-cast-qual -Wno-declaration-after-statement
+CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0)
+LDFLAGS = -pie
+#LDFLAGS +=    -Wl,--warn-common
 
-ifeq ($(VERBOSE),0)
-MAKECMDPREFIX = @
-else
-MAKECMDPREFIX =
-endif
 
-# hardening flags: -fPIE -Wl,-z,now -pie
-CFLAGS += -O2 -Wall $(shell pkg-config --cflags gtk+-2.0) -fPIE
-LDFLAGS += -Wl,-z,now -pie
 LIBS := $(shell pkg-config --libs gtk+-2.0) -lm
 
-OBJS=  src/main.o src/interface.o src/callbacks.o src/ipc.o \
-       src/packet.o src/nodes.o src/routes.o
+all: default_target
 
-all:   olsrd-gui
+default_target: olsrd-gui
 
 olsrd-gui:     $(OBJS)
 ifeq ($(VERBOSE),0)
@@ -25,12 +22,6 @@ ifeq ($(VERBOSE),0)
 endif
        $(MAKECMDPREFIX)$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-%.o: %.c
-ifeq ($(VERBOSE),0)
-       @echo "[CC] $<"
-endif
-       $(MAKECMDPREFIX)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
 .PHONY: clean install
 
 clean: