Diff for /embedaddon/quagga/zebra/Makefile.in between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2012/10/09 09:22:29 version 1.1.1.4, 2013/07/21 23:54:41
Line 1 Line 1
# Makefile.in generated by automake 1.11.5 from Makefile.am.# Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@  # @configure_input@
   
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,# Copyright (C) 1994-2012 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc. 
 # This Makefile.in is free software; the Free Software Foundation  # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
Line 58  sbin_PROGRAMS = zebra$(EXEEXT) Line 57  sbin_PROGRAMS = zebra$(EXEEXT)
 noinst_PROGRAMS = testzebra$(EXEEXT)  noinst_PROGRAMS = testzebra$(EXEEXT)
 subdir = zebra  subdir = zebra
 DIST_COMMON = $(dist_examples_DATA) $(noinst_HEADERS) \  DIST_COMMON = $(dist_examples_DATA) $(noinst_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
         $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \am__aclocal_m4_deps = $(top_srcdir)/m4/ax_sys_weak_alias.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
        $(top_srcdir)/configure.ac        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)          $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d  mkinstalldirs = $(install_sh) -d
Line 79  am_testzebra_OBJECTS = test_main.$(OBJEXT) zebra_rib.$ Line 79  am_testzebra_OBJECTS = test_main.$(OBJEXT) zebra_rib.$
         misc_null.$(OBJEXT)          misc_null.$(OBJEXT)
 testzebra_OBJECTS = $(am_testzebra_OBJECTS)  testzebra_OBJECTS = $(am_testzebra_OBJECTS)
 am__DEPENDENCIES_1 =  am__DEPENDENCIES_1 =
testzebra_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \testzebra_DEPENDENCIES = ../lib/libzebra.la $(am__DEPENDENCIES_1) \
        ../lib/libzebra.la        $(am__DEPENDENCIES_1)
 am__zebra_SOURCES_DIST = 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 irdp_main.c irdp_interface.c \
         irdp_packet.c router-id.c zebra_fpm.c zebra_fpm_netlink.c
 @HAVE_NETLINK_TRUE@am__objects_1 = zebra_fpm_netlink.$(OBJEXT)
 am_zebra_OBJECTS = zserv.$(OBJEXT) main.$(OBJEXT) interface.$(OBJEXT) \  am_zebra_OBJECTS = zserv.$(OBJEXT) main.$(OBJEXT) interface.$(OBJEXT) \
         connected.$(OBJEXT) zebra_rib.$(OBJEXT) \          connected.$(OBJEXT) zebra_rib.$(OBJEXT) \
         zebra_routemap.$(OBJEXT) redistribute.$(OBJEXT) \          zebra_routemap.$(OBJEXT) redistribute.$(OBJEXT) \
         debug.$(OBJEXT) rtadv.$(OBJEXT) zebra_snmp.$(OBJEXT) \          debug.$(OBJEXT) rtadv.$(OBJEXT) zebra_snmp.$(OBJEXT) \
         zebra_vty.$(OBJEXT) irdp_main.$(OBJEXT) \          zebra_vty.$(OBJEXT) irdp_main.$(OBJEXT) \
         irdp_interface.$(OBJEXT) irdp_packet.$(OBJEXT) \          irdp_interface.$(OBJEXT) irdp_packet.$(OBJEXT) \
        router-id.$(OBJEXT)        router-id.$(OBJEXT) zebra_fpm.$(OBJEXT) $(am__objects_1)
 zebra_OBJECTS = $(am_zebra_OBJECTS)  zebra_OBJECTS = $(am_zebra_OBJECTS)
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \  am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \          $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
Line 107  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOO Line 112  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOO
         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \          --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
         $(LDFLAGS) -o $@          $(LDFLAGS) -o $@
 SOURCES = $(testzebra_SOURCES) $(zebra_SOURCES)  SOURCES = $(testzebra_SOURCES) $(zebra_SOURCES)
DIST_SOURCES = $(testzebra_SOURCES) $(zebra_SOURCES)DIST_SOURCES = $(testzebra_SOURCES) $(am__zebra_SOURCES_DIST)
 am__can_run_installinfo = \  am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \    case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \      n|no|NO) false;; \
Line 154  AUTOMAKE = @AUTOMAKE@ Line 159  AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@  AWK = @AWK@
 BABELD = @BABELD@  BABELD = @BABELD@
 BGPD = @BGPD@  BGPD = @BGPD@
   BUILD_TESTS = @BUILD_TESTS@
 CC = @CC@  CC = @CC@
 CCDEPMODE = @CCDEPMODE@  CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@  CFLAGS = @CFLAGS@
Line 179  GREP = @GREP@ Line 185  GREP = @GREP@
 HAVE_LIBPCREPOSIX = @HAVE_LIBPCREPOSIX@  HAVE_LIBPCREPOSIX = @HAVE_LIBPCREPOSIX@
 IF_METHOD = @IF_METHOD@  IF_METHOD = @IF_METHOD@
 IF_PROC = @IF_PROC@  IF_PROC = @IF_PROC@
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
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@  INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_PROGRAM = @INSTALL_PROGRAM@
Line 211  MAKEINFO = @MAKEINFO@ Line 217  MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@  MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@  MKDIR_P = @MKDIR_P@
 MULTIPATH_NUM = @MULTIPATH_NUM@  MULTIPATH_NUM = @MULTIPATH_NUM@
   NETSNMP_CONFIG = @NETSNMP_CONFIG@
 NM = @NM@  NM = @NM@
 NMEDIT = @NMEDIT@  NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@  OBJDUMP = @OBJDUMP@
Line 242  RT_METHOD = @RT_METHOD@ Line 249  RT_METHOD = @RT_METHOD@
 SED = @SED@  SED = @SED@
 SET_MAKE = @SET_MAKE@  SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@  SHELL = @SHELL@
 SNMP_INCLUDES = @SNMP_INCLUDES@  
 SOLARIS = @SOLARIS@  SOLARIS = @SOLARIS@
 STRIP = @STRIP@  STRIP = @STRIP@
 VERSION = @VERSION@  VERSION = @VERSION@
 VTYSH = @VTYSH@  VTYSH = @VTYSH@
 WATCHQUAGGA = @WATCHQUAGGA@  WATCHQUAGGA = @WATCHQUAGGA@
   WEAK_ALIAS = @WEAK_ALIAS@
   WEAK_ALIAS_CROSSFILE = @WEAK_ALIAS_CROSSFILE@
 ZEBRA = @ZEBRA@  ZEBRA = @ZEBRA@
 abs_builddir = @abs_builddir@  abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@  abs_srcdir = @abs_srcdir@
Line 324  ioctl_method = @IOCTL_METHOD@ Line 332  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)
   
   @HAVE_NETLINK_TRUE@othersrc = zebra_fpm_netlink.c
 AM_CFLAGS = $(PICFLAGS)  AM_CFLAGS = $(PICFLAGS)
 AM_LDFLAGS = $(PILDFLAGS)  AM_LDFLAGS = $(PILDFLAGS)
 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 337  testzebra_SOURCES = test_main.c zebra_rib.c interface. Line 347  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)
 EXTRA_DIST = if_ioctl.c if_ioctl_solaris.c if_netlink.c if_proc.c \  EXTRA_DIST = if_ioctl.c if_ioctl_solaris.c if_netlink.c if_proc.c \
         if_sysctl.c ipforward_aix.c ipforward_ews.c ipforward_proc.c \          if_sysctl.c ipforward_aix.c ipforward_ews.c ipforward_proc.c \
Line 473  distclean-compile: Line 484  distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/router-id.Po@am__quote@  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/router-id.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtadv.Po@am__quote@  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtadv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_main.Po@am__quote@  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_main.Po@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zebra_fpm.Po@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zebra_fpm_netlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zebra_rib.Po@am__quote@  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zebra_rib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zebra_routemap.Po@am__quote@  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zebra_routemap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zebra_snmp.Po@am__quote@  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zebra_snmp.Po@am__quote@
Line 576  GTAGS: Line 589  GTAGS:
           && $(am__cd) $(top_srcdir) \            && $(am__cd) $(top_srcdir) \
           && gtags -i $(GTAGS_ARGS) "$$here"            && gtags -i $(GTAGS_ARGS) "$$here"
   
   cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
           list='$(SOURCES) $(HEADERS) $(LISP)'; \
           case "$(srcdir)" in \
             [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
             *) sdir=$(subdir)/$(srcdir) ;; \
           esac; \
           for i in $$list; do \
             if test -f "$$i"; then \
               echo "$(subdir)/$$i"; \
             else \
               echo "$$sdir/$$i"; \
             fi; \
           done >> $(top_builddir)/cscope.files
   
 distclean-tags:  distclean-tags:
         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags          -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
   
Line 720  uninstall-am: uninstall-dist_examplesDATA uninstall-sb Line 747  uninstall-am: uninstall-dist_examplesDATA uninstall-sb
 .MAKE: install-am install-strip  .MAKE: install-am install-strip
   
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
        clean-libtool clean-noinstPROGRAMS clean-sbinPROGRAMS ctags \        clean-libtool clean-noinstPROGRAMS clean-sbinPROGRAMS \
        distclean distclean-compile distclean-generic \        cscopelist ctags distclean distclean-compile distclean-generic \
         distclean-libtool distclean-tags distdir dvi dvi-am html \          distclean-libtool distclean-tags distdir dvi dvi-am html \
         html-am info info-am install install-am install-data \          html-am info info-am install install-am install-data \
         install-data-am install-dist_examplesDATA install-dvi \          install-data-am install-dist_examplesDATA install-dvi \

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


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