summaryrefslogtreecommitdiff
path: root/zebra
diff options
context:
space:
mode:
authorgdt <gdt>2004-07-23 16:23:56 +0000
committergdt <gdt>2004-07-23 16:23:56 +0000
commitb7a97f825768bb3e617cb115540c74b65914e628 (patch)
tree7614897d5d668291f854b5283daf424b55a12853 /zebra
parent33f92320e8a6b078a5972d05c8f49487d8edf19c (diff)
(somewhat unrelated cleanups, but all are very minor)
2004-07-23 Greg Troxel <gdt@poblano.ir.bbn.com> * */Makefile.am: Use ../dir/libfoo.la, rather than "-L../dir -lfoo", to avoid linking against installed libraries from a previous version. * {lib,ospfd,ospfclient}/Makefile.am: explicitly define the shared library version number to be 0.0 * configure.ac: remove spurious , so extract.pl is chmod'd +x. * HACKING: explain shared library versioning rules
Diffstat (limited to 'zebra')
-rw-r--r--zebra/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 0782894c..87a994f1 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -30,7 +30,7 @@ noinst_HEADERS = \
connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \
interface.h ipforward.h irdp.h
-zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) -L../lib -lzebra
+zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la
zebra_DEPENDENCIES = $(otherobj)
@@ -42,8 +42,8 @@ EXTRA_DIST = if_ioctl.c if_ioctl_solaris.c if_netlink.c if_proc.c \
ioctl.c ioctl_solaris.c \
GNOME-SMI GNOME-PRODUCT-ZEBRA-MIB
-#client : client_main.o -L../lib -lzebra
-# $(CC) -g -o client client_main.o -L../lib -lzebra $(LIBS) $(LIB_IPV6)
+#client : client_main.o ../lib/libzebra.la
+# $(CC) -g -o client client_main.o ../liblzebra.la $(LIBS) $(LIB_IPV6)
quaggaconfdir = $(sysconfdir)