osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From David Arnold: 

Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.

svn path=/trunk/; revision=48261
This commit is contained in:
Jaap Keuter 2013-03-12 06:53:39 +00:00
parent 2cc00294c7
commit 827eb58b04
26 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -23,8 +23,6 @@
ACLOCAL_AMFLAGS = `./aclocal-flags`
INCLUDES= @LUA_INCLUDES@
if HAVE_LIBPY
py_dissectors_dir = -DPYTHON_DIR=\"@pythondir@\"
else
@ -535,7 +533,8 @@ dumpcap_LDFLAGS = $(PIE_LDFLAGS)
# Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(PY_CFLAGS)
$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(PY_CFLAGS) \
@LUA_INCLUDES@
#
# Build the version string

2
epan/Makefile.am
View File

@ -60,7 +60,7 @@ libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
include Makefile.common
INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) -I$(builddir)/wslua \
AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) -I$(builddir)/wslua \
@LUA_INCLUDES@ $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) \
$(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(PY_CFLAGS)

6
epan/crypt/Makefile.am
View File

@ -21,15 +21,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
INCLUDES = -I$(top_srcdir)
include Makefile.common
if HAVE_WARNINGS_AS_ERRORS
AM_CFLAGS = -Werror
endif
AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)
$(LIBGCRYPT_CFLAGS)
noinst_LTLIBRARIES = libairpdcap.la

2
epan/dfilter/Makefile.am
View File

@ -47,7 +47,7 @@ MAINTAINERCLEANFILES = \
$(NODIST_GENERATED_FILES) \
Makefile.in
INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
#Since code generated by lex may trigger gcc warnings, we are now generating two
#libraries. A single library is generated with the lex code without the barrier

2
epan/dissectors/Makefile.am
View File

@ -22,7 +22,7 @@
noinst_LTLIBRARIES = libdirtydissectors.la libdissectors.la
INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. \
AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/.. \
$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
include Makefile.common

2
epan/ftypes/Makefile.am
View File

@ -36,7 +36,7 @@ CLEANFILES = \
MAINTAINERCLEANFILES = \
Makefile.in
INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/..
AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/..
libftypes_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)

6
epan/wmem/Makefile.am
View File

@ -27,7 +27,9 @@ endif
include Makefile.common
AM_CPPFLAGS = $(LIBWMEM_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(LIBWMEM_CFLAGS)
noinst_LTLIBRARIES = libwmem.la
@ -41,8 +43,6 @@ DISTCLEANFILES =
MAINTAINERCLEANFILES = \
Makefile.in
INCLUDES = -I$(top_srcdir)
libwmem_la_SOURCES = \
$(LIBWMEM_SRC) \
$(LIBWMEM_INCLUDES)

2
epan/wslua/Makefile.am
View File

@ -25,7 +25,7 @@ if HAVE_WARNINGS_AS_ERRORS
AM_CFLAGS = -Werror
endif
INCLUDES = -I$(top_srcdir) @LUA_INCLUDES@
AM_CPPFLAGS = -I$(top_srcdir) @LUA_INCLUDES@
noinst_LTLIBRARIES = libwslua.la

2
epan/wspython/Makefile.am
View File

@ -36,7 +36,7 @@ CLEANFILES = \
MAINTAINERCLEANFILES = \
Makefile.in
INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/..
AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/..
libwspython_la_SOURCES = $(LIBWSPYTHON_SRC) $(LIBWSPYTHON_INCLUDES)

2
plugins/asn1/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/docsis/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/ethercat/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/gryphon/Makefile.am
View File

@ -26,7 +26,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/irda/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/m2m/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir) -I../wimax
AM_CPPFLAGS = -I$(top_srcdir) -I../wimax
include Makefile.common

2
plugins/mate/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/opcua/Makefile.am
View File

@ -25,7 +25,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/profinet/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/stats_tree/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/tpg/Makefile.am
View File

@ -26,7 +26,7 @@ if HAVE_WARNINGS_AS_ERRORS
AM_CFLAGS = -Werror
endif
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
plugindir = @plugindir@

2
plugins/unistim/Makefile.am
View File

@ -25,7 +25,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/wimax/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/wimaxasncp/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
plugins/wimaxmacphy/Makefile.am
View File

@ -24,7 +24,7 @@
include $(top_srcdir)/Makefile.am.inc
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
include Makefile.common

2
wiretap/Makefile.am
View File

@ -38,7 +38,7 @@ if HAVE_WARNINGS_AS_ERRORS
AM_NON_GENERATED_CFLAGS += -Werror
endif
INCLUDES = -I$(srcdir)/..
AM_CPPFLAGS = -I$(srcdir)/..
CLEANFILES = \
libwiretap.a \

2
wsutil/Makefile.am
View File

@ -64,7 +64,7 @@ lib_LTLIBRARIES = libwsutil.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
INCLUDES = -I$(srcdir)/..
AM_CPPFLAGS = -I$(srcdir)/..
libwsutil_la_SOURCES = \
$(LIBWSUTIL_SRC) \