[PATCH 1/2] Do not hide global defines in subdirs makefiles

[Ladislav Michl]

Some makefiles use plain assigment for DEFS, so defines from
higer levels are lost.
---
 common/Makefile.am         | 2 +-
 common/data/Makefile.am    | 2 --
 common/devices/Makefile.am | 2 --
 common/links/Makefile.am   | 2 --
 common/phones/Makefile.am  | 2 --
 utils/Makefile.am          | 2 +-
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 597ba7dc..5e6be928 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,4 +1,4 @@
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DCOMPILING_LIBGNOKII
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DCOMPILING_LIBGNOKII @DEFS@
 
 if WIN32
 DATA_DIR = 
diff --git a/common/data/Makefile.am b/common/data/Makefile.am
index 619bda38..b2261bdf 100644
--- a/common/data/Makefile.am
+++ b/common/data/Makefile.am
@@ -1,5 +1,3 @@
-DEFS = -DCOMPILING_LIBGNOKII
-
 noinst_LTLIBRARIES = libDATA.la
 libDATA_la_SOURCES = \
        at-emulator.c \
diff --git a/common/devices/Makefile.am b/common/devices/Makefile.am
index 9beef37a..860762e4 100644
--- a/common/devices/Makefile.am
+++ b/common/devices/Makefile.am
@@ -1,5 +1,3 @@
-DEFS = -DCOMPILING_LIBGNOKII
-
 noinst_LTLIBRARIES = libDEVICES.la
 
 WIN32_FILES = \
diff --git a/common/links/Makefile.am b/common/links/Makefile.am
index 118be48d..5dfa0aa9 100644
--- a/common/links/Makefile.am
+++ b/common/links/Makefile.am
@@ -1,5 +1,3 @@
-DEFS = -DCOMPILING_LIBGNOKII
-
 noinst_LTLIBRARIES = libLINKS.la
 libLINKS_la_SOURCES = \
        atbus.c \
diff --git a/common/phones/Makefile.am b/common/phones/Makefile.am
index 20e0eaec..4c446389 100644
--- a/common/phones/Makefile.am
+++ b/common/phones/Makefile.am
@@ -1,5 +1,3 @@
-DEFS = -DCOMPILING_LIBGNOKII
-
 AM_CFLAGS = $(LIBPCSCLITE_CFLAGS)
 
 noinst_LTLIBRARIES = libPHONES.la
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 763d0206..db79425e 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
-DEFS = -DLOCALEDIR=\"$(localedir)\"
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 sbin_PROGRAMS = mgnokiidev
 mgnokiidev_SOURCES = mgnokiidev.c
-- 
2.20.0.rc2