osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36064?usp=email )
Change subject: Cosmetic: AM_CFLAGS: make diff friendly ......................................................................
Cosmetic: AM_CFLAGS: make diff friendly
Change-Id: I3303cd8ba8c8b21ff267608833d9fb4833ffc471 --- M ggsn/Makefile.am M gtp/Makefile.am M lib/Makefile.am M sgsnemu/Makefile.am M tests/gtp/Makefile.am M tests/lib/Makefile.am 6 files changed, 51 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/64/36064/1
diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index d4c82ad..0c6f334 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -2,7 +2,15 @@
AM_LDFLAGS = @EXEC_LDFLAGS@
-AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CFLAGS = \ + -D_GNU_SOURCE \ + -fno-builtin \ + -Wall \ + -DSBINDIR='"$(sbindir)"' \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(NULL)
osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 99ad8bb..f96f429 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -8,7 +8,12 @@
include_HEADERS = gtp.h gsn.h pdp.h gtpie.h
-AM_CFLAGS = -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = \ + -fno-builtin \ + -Wall \ + -DSBINDIR='"$(sbindir)"' \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL)
libgtp_la_SOURCES = gtp.c gtp.h gsn.c gsn.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined diff --git a/lib/Makefile.am b/lib/Makefile.am index 9dcd13b..9dfd456 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,12 @@
noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h netns.h util.h icmpv6.h checksum.h
-AM_CFLAGS = -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = \ + -fno-builtin \ + -Wall \ + -DSBINDIR='"$(sbindir)"' \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL)
libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c netns.c util.c icmpv6.c checksum.c
diff --git a/sgsnemu/Makefile.am b/sgsnemu/Makefile.am index 1f75de0..7e7fdbb 100644 --- a/sgsnemu/Makefile.am +++ b/sgsnemu/Makefile.am @@ -2,12 +2,21 @@
AM_LDFLAGS = @EXEC_LDFLAGS@
-AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = \ + -D_GNU_SOURCE \ + -fno-builtin \ + -Wall \ + -DSBINDIR='"$(sbindir)"' \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL)
sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS)
if ENABLE_GTP_KERNEL -AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) +AM_CFLAGS += \ + -DGTP_KERNEL \ + $(LIBGTPNL_CFLAGS) \ + $(NULL) sgsnemu_LDADD += $(LIBGTPNL_LIBS) endif
diff --git a/tests/gtp/Makefile.am b/tests/gtp/Makefile.am index ef69260..ad2ed82 100644 --- a/tests/gtp/Makefile.am +++ b/tests/gtp/Makefile.am @@ -1,4 +1,8 @@ -AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = \ + -Wall \ + -I$(top_srcdir)/include \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL) AM_LDFLAGS = -no-install
EXTRA_DIST = \ diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index e807281..7c01915 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -1,4 +1,8 @@ -AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = \ + -Wall \ + -I$(top_srcdir)/include \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL) AM_LDFLAGS = -no-install
EXTRA_DIST = ippool_test.ok \
-
osmith