$NetBSD: patch-ad,v 1.4 2000/10/13 17:55:36 kim Exp $ --- apps/Makefile.in.orig Tue Apr 18 06:46:55 2000 +++ apps/Makefile.in Wed Oct 11 19:04:29 2000 @@ -14,5 +14,7 @@ -USELIBS = ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) -LOCAL_LIBS = -L../snmplib -LIBS = $(CC_RUNTIME_ARG) -lsnmp @LIBS@ +#USELIBS = ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) +USELIBS= ../snmplib/libsnmp.la +#LOCAL_LIBS = -L../snmplib +#LIBS = $(CC_RUNTIME_ARG) -lsnmp @LIBS@ +LIBS= ${USELIBS} @LIBS@ @@ -33,33 +35,33 @@ snmpwalk: snmpwalk.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmpbulkwalk: snmpbulkwalk.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmpbulkget: snmpbulkget.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpbulkget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpbulkget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmptranslate: snmptranslate.o $(USELIBS) - ${CC} -o $@ snmptranslate.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmptranslate.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmpstatus: snmpstatus.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpstatus.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpstatus.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmpget: snmpget.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmpdelta: snmpdelta.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpdelta.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpdelta.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmptable: snmptable.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmptable.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmptable.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmptest: snmptest.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmptest.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmptest.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmptrapd: snmptrapd.o snmptrapd_handlers.o $(USELIBS) - ${CC} -o $@ snmptrapd.o snmptrapd_handlers.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmptrapd.o snmptrapd_handlers.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmptrap: snmptrap.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmptrap.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmptrap.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} rm -f snmpinform @@ -68,12 +70,12 @@ snmpset: snmpset.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpset.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpset.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmpusm: snmpusm.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpusm.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpusm.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmpgetnext: snmpgetnext.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ snmpgetnext.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ snmpgetnext.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} encode_keychange: encode_keychange.o $(PARSEOBJS) $(USELIBS) - ${CC} -o $@ encode_keychange.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LIBTOOL) ${CC} -o $@ encode_keychange.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} @@ -91,6 +93,6 @@ done - @for i in $(TARG) ; do $(INSTALL) $$i $(bindir) ; echo "install: installed $$i in $(bindir)" ; done + @for i in $(TARG) ; do $(LIBTOOL) $(INSTALL) $$i $(bindir) ; echo "install: installed $$i in $(bindir)" ; done rm -f $(bindir)/snmpinform (cd $(bindir) && $(LN_S) snmptrap snmpinform) - @for i in $(SBINTARG) ; do $(INSTALL) $$i $(sbindir) ; echo "install: installed $$i in $(sbindir)" ; done + @for i in $(SBINTARG) ; do $(LIBTOOL) $(INSTALL) $$i $(sbindir) ; echo "install: installed $$i in $(sbindir)" ; done