diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-03 13:59:04 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-03 14:29:13 +0100 |
| commit | 55c728031529910cd8358bedb90f75d363afeb4b (patch) | |
| tree | 5553cc267888f3b26e43af9fe2d6697b80361b8f /zebra | |
| parent | Merge pull request #153 from LabNConsulting/working/2.0/patch-set/rr-part2 (diff) | |
| download | frr-55c728031529910cd8358bedb90f75d363afeb4b.tar.xz frr-55c728031529910cd8358bedb90f75d363afeb4b.zip | |
*: Convert libzebra -> libfrr
The library libzebra that is installed with FRR will
conflict with Quagga. So let's rename it to libfrr.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to '')
| -rw-r--r-- | zebra/Makefile.am | 6 | ||||
| -rw-r--r-- | zebra/main.c | 2 | ||||
| -rw-r--r-- | zebra/test_main.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/zebra/Makefile.am b/zebra/Makefile.am index d1c160ade..f6a056e3f 100644 --- a/zebra/Makefile.am +++ b/zebra/Makefile.am @@ -63,9 +63,9 @@ noinst_HEADERS = \ zebra_ns.h zebra_vrf.h ioctl_solaris.h zebra_static.h zebra_mpls.h \ kernel_netlink.h if_netlink.h -zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIBCAP) $(Q_FPM_PB_CLIENT_LDOPTS) +zebra_LDADD = $(otherobj) ../lib/libfrr.la $(LIBCAP) $(Q_FPM_PB_CLIENT_LDOPTS) -testzebra_LDADD = ../lib/libzebra.la $(LIBCAP) +testzebra_LDADD = ../lib/libfrr.la $(LIBCAP) zebra_DEPENDENCIES = $(otherobj) @@ -78,7 +78,7 @@ EXTRA_DIST = if_ioctl.c if_ioctl_solaris.c if_netlink.c \ zebra_mpls_netlink.c zebra_mpls_openbsd.c \ GNOME-SMI GNOME-PRODUCT-ZEBRA-MIB -client : client_main.o ../lib/libzebra.la +client : client_main.o ../lib/libfrr.la $(CC) -g -o client client_main.o ../liblzebra.la $(LIBS) $(LIB_IPV6) quaggaconfdir = $(sysconfdir) diff --git a/zebra/main.c b/zebra/main.c index a68e8adeb..79c9ea702 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -63,7 +63,7 @@ pid_t pid; /* VTY Socket prefix */ char vty_sock_path[MAXPATHLEN] = ZEBRA_VTYSH_PATH; -/* Pacify zclient.o in libzebra, which expects this variable. */ +/* Pacify zclient.o in libfrr, which expects this variable. */ struct thread_master *master; /* Route retain mode flag. */ diff --git a/zebra/test_main.c b/zebra/test_main.c index 76ce92c37..0f7e1a22b 100644 --- a/zebra/test_main.c +++ b/zebra/test_main.c @@ -56,7 +56,7 @@ int allow_delete = 0; /* zebra_rib's workqueue hold time. Private export for use by test code only */ extern int rib_process_hold_time; -/* Pacify zclient.o in libzebra, which expects this variable. */ +/* Pacify zclient.o in libfrr, which expects this variable. */ struct thread_master *master; /* Command line options. */ |