Diff for /embedaddon/quagga/zebra/Makefile.am between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 17:26:11 version 1.1.1.2, 2013/07/21 23:54:41
Line 1 Line 1
 ## Process this file with automake to produce Makefile.in.  ## Process this file with automake to produce Makefile.in.
   
INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @SNMP_INCLUDES@INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@  DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
 INSTALL_SDATA=@INSTALL@ -m 600  INSTALL_SDATA=@INSTALL@ -m 600
   
Line 19  ioctl_method = @IOCTL_METHOD@ Line 19  ioctl_method = @IOCTL_METHOD@
 otherobj = $(ioctl_method) $(ipforward) $(if_method) $(if_proc) \  otherobj = $(ioctl_method) $(ipforward) $(if_method) $(if_proc) \
         $(rt_method) $(rtread_method) $(kernel_method) $(other_method)          $(rt_method) $(rtread_method) $(kernel_method) $(other_method)
   
   if HAVE_NETLINK
   othersrc = zebra_fpm_netlink.c
   endif
   
 AM_CFLAGS = $(PICFLAGS)  AM_CFLAGS = $(PICFLAGS)
 AM_LDFLAGS = $(PILDFLAGS)  AM_LDFLAGS = $(PILDFLAGS)
   
Line 29  noinst_PROGRAMS = testzebra Line 33  noinst_PROGRAMS = testzebra
 zebra_SOURCES = \  zebra_SOURCES = \
         zserv.c main.c interface.c connected.c zebra_rib.c zebra_routemap.c \          zserv.c main.c interface.c connected.c zebra_rib.c zebra_routemap.c \
         redistribute.c debug.c rtadv.c zebra_snmp.c zebra_vty.c \          redistribute.c debug.c rtadv.c zebra_snmp.c zebra_vty.c \
        irdp_main.c irdp_interface.c irdp_packet.c router-id.c        irdp_main.c irdp_interface.c irdp_packet.c router-id.c zebra_fpm.c \
         $(othersrc)
   
 testzebra_SOURCES = test_main.c zebra_rib.c interface.c connected.c debug.c \  testzebra_SOURCES = test_main.c zebra_rib.c interface.c connected.c debug.c \
         zebra_vty.c \          zebra_vty.c \
Line 37  testzebra_SOURCES = test_main.c zebra_rib.c interface. Line 42  testzebra_SOURCES = test_main.c zebra_rib.c interface.
   
 noinst_HEADERS = \  noinst_HEADERS = \
         connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \          connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \
        interface.h ipforward.h irdp.h router-id.h kernel_socket.h        interface.h ipforward.h irdp.h router-id.h kernel_socket.h \
         rt_netlink.h zebra_fpm.h zebra_fpm_private.h
   
zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.lazebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIBCAP) $(LIB_IPV6)
   
testzebra_LDADD = $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.latestzebra_LDADD = ../lib/libzebra.la $(LIBCAP) $(LIB_IPV6)
   
 zebra_DEPENDENCIES = $(otherobj)  zebra_DEPENDENCIES = $(otherobj)
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>