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:
parent
2cc00294c7
commit
827eb58b04
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ if HAVE_WARNINGS_AS_ERRORS
|
|||
AM_CFLAGS = -Werror
|
||||
endif
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
plugindir = @plugindir@
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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) \
|
||||
|
|
Loading…
Reference in New Issue