Changeset bd119b3


Ignore:
Timestamp:
05/29/14 16:18:23 (7 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
abf01b6
Parents:
9b42f3e
Message:

Replace INCLUDES with AM_CPPFLAGS in Makefile.am's

Again, newer autotools versions complain about using these
outdated terms.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    r10f924c rbd119b3  
    5858endif
    5959
    60 INCLUDES= @ADD_INCLS@ -I../libwandio
     60AM_CPPFLAGS= @ADD_INCLS@ -I../libwandio
    6161libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@ $(DPDKLIBS)
    6262libtrace_la_LDFLAGS=-version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ @ADD_LDFLAGS@
  • libpacketdump/Makefile.am

    r8b49230 rbd119b3  
    172172dist_plugin_DATA = $(TXT_PROTOCOLS)
    173173
    174 INCLUDES= @ADD_INCLS@ -I../lib -I../libwandio
     174AM_CPPFLAGS= @ADD_INCLS@ -I../lib -I../libwandio
    175175
    176176# NOTE: You CANNOT add @LEXLIBS@ here, as they are statically compiled
     
    182182        @ADD_LDFLAGS@
    183183
    184 AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(plugindir)\" $(INCLUDES)
     184AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(plugindir)\" $(AM_CPPFLAGS)
    185185BUILT_SOURCES=parser.h
    186186AM_YFLAGS=-d
  • libwandio/Makefile.am

    r10f924c rbd119b3  
    2828                $(LIBTRACEIO_ZLIB) $(LIBTRACEIO_BZLIB) $(LIBTRACEIO_LZO)
    2929
    30 INCLUDES = @ADD_INCLS@
     30AM_CPPFLAGS = @ADD_INCLS@
    3131libwandio_la_LIBADD = @LIBWANDIO_LIBS@
    3232libwandio_la_LDFLAGS=-version-info 1:0:0 @ADD_LDFLAGS@
Note: See TracChangeset for help on using the changeset viewer.