Jan Engelhardt
5d6ccd68d8
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=1
74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
From 603f6c40d55b87f81fbd8ff1ad7b9568f3b962ff Mon Sep 17 00:00:00 2001
|
|
From: Martin Hauke <mardnh@gmx.de>
|
|
Date: Thu, 11 Sep 2014 17:11:38 +0200
|
|
Subject: [PATCH] build: rename INCLUDES to AM_CPPFLAGS in Makefile.am to avoid
|
|
warnings
|
|
|
|
---
|
|
Makefile.am | 2 +-
|
|
examples/Makefile.am | 2 +-
|
|
examples/channel/Makefile.am | 2 +-
|
|
src/Makefile.am | 2 +-
|
|
src/channel/abis/Makefile.am | 2 +-
|
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 91abed1..c8a05a3 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -1,7 +1,7 @@
|
|
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
|
|
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
|
|
SUBDIRS = include src examples tests
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
diff --git a/examples/Makefile.am b/examples/Makefile.am
|
|
index e7742cd..f8cfc8f 100644
|
|
--- a/examples/Makefile.am
|
|
+++ b/examples/Makefile.am
|
|
@@ -1,4 +1,4 @@
|
|
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
|
|
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
|
|
AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
|
|
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
|
|
|
diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am
|
|
index 6ab34b6..4191c94 100644
|
|
--- a/examples/channel/Makefile.am
|
|
+++ b/examples/channel/Makefile.am
|
|
@@ -1,4 +1,4 @@
|
|
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
|
|
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
|
|
AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
|
|
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 4fd93d7..8b4b58e 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -2,7 +2,7 @@
|
|
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
|
|
LIBVERSION=2:0:0
|
|
|
|
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
|
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
|
AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
|
|
|
|
diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am
|
|
index 3c6fef6..e4d93a3 100644
|
|
--- a/src/channel/abis/Makefile.am
|
|
+++ b/src/channel/abis/Makefile.am
|
|
@@ -1,4 +1,4 @@
|
|
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
|
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
|
AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
|
|
|
|
--
|
|
2.0.0
|
|
|