2003-08-27 Jay Fenlason <fenlason@redhat.com>
* lib/Makefile.am: Do not use a lib (libcap) as a dependency
* zebra/Makefile.am: Link in libcap
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d041770..2aec295 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,7 +12,7 @@
filter.c routemap.c distribute.c stream.c str.c log.c plist.c \
zclient.c sockopt.c smux.c md5.c if_rmap.c keychain.c privs.c debug.c
-libzebra_a_DEPENDENCIES = @LIB_REGEX@ @LIBCAP@
+libzebra_a_DEPENDENCIES = @LIB_REGEX@
libzebra_a_LIBADD = @LIB_REGEX@
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index ce56467..1df72d7 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -5,6 +5,7 @@
INSTALL_SDATA=@INSTALL@ -m 600
LIB_IPV6 = @LIB_IPV6@
+LIBCAP = @LIBCAP@
ipforward = @IPFORWARD@
if_method = @IF_METHOD@
@@ -13,10 +14,9 @@
rtread_method = @RTREAD_METHOD@
kernel_method = @KERNEL_METHOD@
other_method = @OTHER_METHOD@
-libcap = @LIBCAP@
otherobj = $(ipforward) $(if_method) $(if_proc) $(rt_method) \
- $(rtread_method) $(kernel_method) $(other_method) $(libcap)
+ $(rtread_method) $(kernel_method) $(other_method)
sbin_PROGRAMS = zebra
@@ -28,7 +28,7 @@
connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \
interface.h ipforward.h
-zebra_LDADD = ../lib/libzebra.a $(otherobj) $(LIB_IPV6)
+zebra_LDADD = ../lib/libzebra.a $(otherobj) $(LIBCAP) $(LIB_IPV6)
zebra_DEPENDENCIES = $(otherobj)