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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/Makefile.am | 8 | ||||
| -rw-r--r-- | lib/linklist.h | 2 | ||||
| -rw-r--r-- | lib/memory.c | 2 | ||||
| -rw-r--r-- | lib/thread.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 723950681..f393836cc 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,10 +5,10 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \ AM_CFLAGS = $(WERROR) DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -lib_LTLIBRARIES = libzebra.la -libzebra_la_LDFLAGS = -version-info 0:0:0 +lib_LTLIBRARIES = libfrr.la +libfrr_la_LDFLAGS = -version-info 0:0:0 -libzebra_la_SOURCES = \ +libfrr_la_SOURCES = \ network.c pid_output.c getopt.c getopt1.c \ checksum.c vector.c linklist.c vty.c command.c \ sockunion.c prefix.c thread.c if.c buffer.c table.c hash.c \ @@ -24,7 +24,7 @@ libzebra_la_SOURCES = \ BUILT_SOURCES = route_types.h gitversion.h -libzebra_la_LIBADD = @LIBCAP@ +libfrr_la_LIBADD = @LIBCAP@ pkginclude_HEADERS = \ buffer.h checksum.h command.h filter.h getopt.h hash.h \ diff --git a/lib/linklist.h b/lib/linklist.h index e99e50f4f..052025a86 100644 --- a/lib/linklist.h +++ b/lib/linklist.h @@ -137,7 +137,7 @@ extern void list_add_list (struct list *, struct list *); /* Deprecated: 20050406 */ #if !defined(QUAGGA_NO_DEPRECATED_INTERFACES) -#warning "Using deprecated libzebra interfaces" +#warning "Using deprecated libfrr interfaces" #define LISTNODE_ADD(L,N) LISTNODE_ATTACH(L,N) #define LISTNODE_DELETE(L,N) LISTNODE_DETACH(L,N) #define nextnode(X) ((X) = (X)->next) diff --git a/lib/memory.c b/lib/memory.c index f17915486..45aaf7d79 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -23,7 +23,7 @@ static struct memgroup *mg_first = NULL; struct memgroup **mg_insert = &mg_first; -DEFINE_MGROUP(LIB, "libzebra") +DEFINE_MGROUP(LIB, "libfrr") DEFINE_MTYPE(LIB, TMP, "Temporary memory") static inline void diff --git a/lib/thread.h b/lib/thread.h index e41e96dec..3440a9299 100644 --- a/lib/thread.h +++ b/lib/thread.h @@ -242,7 +242,7 @@ extern unsigned long timeval_elapsed (struct timeval a, struct timeval b); /* set yield time for thread */ extern void thread_set_yield_time (struct thread *, unsigned long); -/* Internal libzebra exports */ +/* Internal libfrr exports */ extern void thread_getrusage (RUSAGE_T *); extern struct cmd_element show_thread_cpu_cmd; extern struct cmd_element clear_thread_cpu_cmd; |